diff options
| author |   Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2014-07-03 10:18:08 -0500 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2014-07-25 17:16:59 -0400 |
| commit | 2a5ac32653786871f03a22ecd524617cf53e1b53 (patch) | |
| tree | 33e40a3ef0ec118aaed876517ea554aa87bb12e2 /drivers/scsi | |
| parent | MAINTAINERS: Update maintainer list for bnx2i and bnx2fc (diff) | |
| download | linux-dev-2a5ac32653786871f03a22ecd524617cf53e1b53.tar.xz linux-dev-2a5ac32653786871f03a22ecd524617cf53e1b53.zip | |
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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/hpsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index a59e1e022e37..1d284730d66b 100644 --- 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); |