hpsa: make hpsa_init_one return -ENOMEM if allocation of h->lockup_detected fails
authorStephen M. Cameron <scameron@beardog.cce.hp.com>
Thu, 3 Jul 2014 15:18:08 +0000 (10:18 -0500)
committerChristoph Hellwig <hch@lst.de>
Fri, 25 Jul 2014 21:16:59 +0000 (17:16 -0400)
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>
drivers/scsi/hpsa.c

index a59e1e0..1d28473 100644 (file)
@@ -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);