diff options
| author | Joe Handzik <joseph.t.handzik@hp.com> | 2014-05-15 15:44:47 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-05-19 19:12:29 +0200 |
| commit | 96444fbbbf3b55a9cd1e337cc5c8c7d04bb364b7 (patch) | |
| tree | 12afc583112ca99e5d494589a01b51f7067f0f2f | |
| parent | 6e8e8088aa9d2f0108dda6943aea8930be6f8f22 (diff) | |
| download | linux-96444fbbbf3b55a9cd1e337cc5c8c7d04bb364b7.tar.gz linux-96444fbbbf3b55a9cd1e337cc5c8c7d04bb364b7.tar.bz2 linux-96444fbbbf3b55a9cd1e337cc5c8c7d04bb364b7.zip | |
hpsa: do not ignore failure of sense controller parameters command
Signed-off-by: Joe Handzik <joseph.t.handzik@hp.com>
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/hpsa.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 7eb3b9a78537..13d4cc5685b7 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -2983,12 +2983,12 @@ static int hpsa_hba_mode_enabled(struct ctlr_info *h) GFP_KERNEL); if (!ctlr_params) - return 0; + return -ENOMEM; rc = hpsa_bmic_ctrl_mode_sense(h, RAID_CTLR_LUNID, 0, ctlr_params, sizeof(struct bmic_controller_parameters)); - if (rc != 0) { + if (rc) { kfree(ctlr_params); - return 0; + return rc; } hba_mode_enabled = @@ -3035,6 +3035,8 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno) memset(lunzerobits, 0, sizeof(lunzerobits)); rescan_hba_mode = hpsa_hba_mode_enabled(h); + if (rescan_hba_mode < 0) + goto out; if (!h->hba_mode_enabled && rescan_hba_mode) dev_warn(&h->pdev->dev, "HBA mode enabled\n"); |