]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
hpsa: do not ignore return value of hpsa_register_scsi
authorStephen Cameron <stephenmcameron@gmail.com>
Fri, 6 Nov 2015 13:47:40 +0000 (05:47 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 19:46:14 +0000 (11:46 -0800)
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>
Orabug: 22075051
Acked-by: Chuck Anderson <chuck.anderson@oracle.com>
drivers/scsi/hpsa.c

index 2e4ef069469f1013404045d5cf16d62737bd453d..6f8875672f9a19186fcf1376152ba9aa1bb78198 100644 (file)
@@ -7407,7 +7407,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;