aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid/megaraid_sas_base.c
diff options
context:
space:
mode:
authorShivasharan S <shivasharan.srikanteshwara@broadcom.com>2018-06-04 03:45:10 -0700
committerMartin K. Petersen <martin.petersen@oracle.com>2018-06-18 21:05:32 -0400
commitc3b10a55abc943a526aaecd7e860b15671beb906 (patch)
treeb6b7cd7e02336c61b857c06d9d030445bf5b77af /drivers/scsi/megaraid/megaraid_sas_base.c
parentscsi: megaraid_sas: Do not do Kill adapter if GET_CTRL_INFO times out (diff)
downloadlinux-dev-c3b10a55abc943a526aaecd7e860b15671beb906.tar.xz
linux-dev-c3b10a55abc943a526aaecd7e860b15671beb906.zip
scsi: megaraid_sas: Update controller info during resume
There is a possibility that firmware on the controller was upgraded before system was suspended. During resume, driver needs to read updated controller properties. Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to '')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 6554ce81c0dd..c787fed48ec7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -6790,6 +6790,9 @@ megasas_resume(struct pci_dev *pdev)
goto fail_init_mfi;
}
+ if (megasas_get_ctrl_info(instance) != DCMD_SUCCESS)
+ goto fail_init_mfi;
+
tasklet_init(&instance->isr_tasklet, instance->instancet->tasklet,
(unsigned long)instance);