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>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 7eb3b9a78537215fb5da52d7fb94dafd8ee02e31..13d4cc5685b7fc301c2e135daba784b7bfd283a0 100644 (file)
--- 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");