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>

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 71d97573a667fe1f2870df134f186d9f2ffb9839..6554ce81c0dd031b1901df038d4dfcba4b3e574c 100644 (file)
--- 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;
 }