hpsa: make hpsa_init_one return -ENOMEM if allocation of h->lockup_detected fails

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Reviewed-by: Joe Handzik <joseph.t.handzik@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a59e1e022e3716cb13caf2de2e0a9d82636ad20f..1d284730d66b4a2785681462bd00ca3a29a3f85d 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6995,8 +6995,10 @@ reinit_after_soft_reset:
 
        /* Allocate and clear per-cpu variable lockup_detected */
        h->lockup_detected = alloc_percpu(u32);
-       if (!h->lockup_detected)
+       if (!h->lockup_detected) {
+               rc = -ENOMEM;
                goto clean1;
+       }
        set_lockup_detected_for_all_cpus(h, 0);
 
        rc = hpsa_pci_init(h);