diff options
| author |   Shivasharan S <shivasharan.srikanteshwara@broadcom.com> | 2018-06-04 03:45:09 -0700 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2018-06-18 21:05:32 -0400 |
| commit | 2747e6be4ca71b1c44ed25c89cc100f89a4e913b (patch) | |
| tree | db64b8c19a920d5b4b965ecdf1c8e8b2d701181d /drivers/scsi/megaraid/megaraid_sas_base.c | |
| parent | scsi: mpt3sas: Update driver version "26.100.00.00" (diff) | |
| download | linux-dev-2747e6be4ca71b1c44ed25c89cc100f89a4e913b.tar.xz linux-dev-2747e6be4ca71b1c44ed25c89cc100f89a4e913b.zip | |
scsi: megaraid_sas: Do not do Kill adapter if GET_CTRL_INFO times out
If MR_DCMD_CTRL_GET_INFO DCMD timed out, return failure rather than doing
kill adapter.
Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_base.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 71d97573a667..6554ce81c0dd 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -4755,14 +4755,15 @@ megasas_get_ctrl_info(struct megasas_instance *instance) __func__, __LINE__); break; } + break; case DCMD_FAILED: megaraid_sas_kill_hba(instance); break; } - megasas_return_cmd(instance, cmd); - + if (ret != DCMD_TIMEOUT) + megasas_return_cmd(instance, cmd); return ret; } |