From: Joe Handzik <joseph.t.hand...@hp.com>
Signed-off-by: Joe Handzik <joseph.t.hand...@hp.com>
Signed-off-by: Stephen M. Cameron <scame...@beardog.cce.hp.com>
Reviewed-by: Stephen M. Cameron <scame...@beardog.cce.hp.com>
---
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 e2f85e7..b4b745b 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2979,12 +2979,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 =
@@ -3031,6 +3031,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");
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
