From 2747e6be4ca71b1c44ed25c89cc100f89a4e913b Mon Sep 17 00:00:00 2001 From: Shivasharan S Date: Mon, 4 Jun 2018 03:45:09 -0700 Subject: [PATCH] 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 Signed-off-by: Martin K. Petersen --- drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 71d97573a667f..6554ce81c0dd0 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; } -- 2.30.2