mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
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>
This commit is contained in:
parent
6e8e8088aa
commit
96444fbbbf
1 changed files with 5 additions and 3 deletions
|
@ -2983,12 +2983,12 @@ static int hpsa_hba_mode_enabled(struct ctlr_info *h)
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
|
|
||||||
if (!ctlr_params)
|
if (!ctlr_params)
|
||||||
return 0;
|
return -ENOMEM;
|
||||||
rc = hpsa_bmic_ctrl_mode_sense(h, RAID_CTLR_LUNID, 0, ctlr_params,
|
rc = hpsa_bmic_ctrl_mode_sense(h, RAID_CTLR_LUNID, 0, ctlr_params,
|
||||||
sizeof(struct bmic_controller_parameters));
|
sizeof(struct bmic_controller_parameters));
|
||||||
if (rc != 0) {
|
if (rc) {
|
||||||
kfree(ctlr_params);
|
kfree(ctlr_params);
|
||||||
return 0;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
hba_mode_enabled =
|
hba_mode_enabled =
|
||||||
|
@ -3035,6 +3035,8 @@ static void hpsa_update_scsi_devices(struct ctlr_info *h, int hostno)
|
||||||
memset(lunzerobits, 0, sizeof(lunzerobits));
|
memset(lunzerobits, 0, sizeof(lunzerobits));
|
||||||
|
|
||||||
rescan_hba_mode = hpsa_hba_mode_enabled(h);
|
rescan_hba_mode = hpsa_hba_mode_enabled(h);
|
||||||
|
if (rescan_hba_mode < 0)
|
||||||
|
goto out;
|
||||||
|
|
||||||
if (!h->hba_mode_enabled && rescan_hba_mode)
|
if (!h->hba_mode_enabled && rescan_hba_mode)
|
||||||
dev_warn(&h->pdev->dev, "HBA mode enabled\n");
|
dev_warn(&h->pdev->dev, "HBA mode enabled\n");
|
||||||
|
|
Loading…
Reference in a new issue