summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Cameron <stephenmcameron@gmail.com>2015-04-23 14:32:37 (GMT)
committerJames Bottomley <JBottomley@Odin.com>2015-05-31 18:26:20 (GMT)
commit4a4384ceda6cf646f1f0810eefe3f79e8f01e5d8 (patch)
treea8281f00dc1d320c25896ced0688d0ec4832b931 /drivers
parent360c73bdde4537397f70b17cadd8139ff1f75ab9 (diff)
downloadlinux-4a4384ceda6cf646f1f0810eefe3f79e8f01e5d8.tar.xz
hpsa: do not ignore return value of hpsa_register_scsi
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> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Reviewed-by: Hannes Reinecke <hare@Suse.de> Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/hpsa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 6bb8a36..7eff9e0 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -7408,7 +7408,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;