| Message ID | 20150416134735.30238.9294.stgit@brunhilda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/16/2015 03:47 PM, Don Brace wrote: > From: Stephen Cameron <stephenmcameron@gmail.com> > > add error handling for failure when registering with SCSI subsystem. > > Reviewed-by: Scott Teel <scott.teel@pmcs.com> > Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com> > Signed-off-by: Don Brace <don.brace@pmcs.com> > --- > drivers/scsi/hpsa.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c > index 037b549..292b8bd 100644 > --- a/drivers/scsi/hpsa.c > +++ b/drivers/scsi/hpsa.c > @@ -7427,7 +7427,9 @@ reinit_after_soft_reset: > h->access.set_intr_mask(h, HPSA_INTR_ON); > > hpsa_hba_inquiry(h); > - hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ > + rc = hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ > + if (rc) > + goto clean4; > > /* Monitor the controller for firmware lockups */ > h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL; > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On 04/16/2015 03:47 PM, Don Brace wrote: > From: Stephen Cameron <stephenmcameron@gmail.com> > > add error handling for failure when registering with SCSI subsystem. > > Reviewed-by: Scott Teel <scott.teel@pmcs.com> > Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com> > Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Tomas -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 037b549..292b8bd 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -7427,7 +7427,9 @@ reinit_after_soft_reset: h->access.set_intr_mask(h, HPSA_INTR_ON); hpsa_hba_inquiry(h); - hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ + rc = hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ + if (rc) + goto clean4; /* Monitor the controller for firmware lockups */ h->heartbeat_sample_interval = HEARTBEAT_SAMPLE_INTERVAL;