Fix - In TM code, smid_task is valid only in case of task aborts.

Signed-off-by: Kashyap Desai <kashyap.de...@broadcom.com>
Signed-off-by: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
Reviewed-by: Hannes Reinecke <h...@suse.com>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c 
b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index a308e14..c239762 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -3754,7 +3754,7 @@ static int megasas_track_scsiio(struct megasas_instance 
*instance,
        struct megasas_cmd_fusion *cmd_fusion;
        struct megasas_cmd *cmd_mfi;
        union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc;
-       struct fusion_context *fusion;
+       struct fusion_context *fusion = NULL;
        struct megasas_cmd_fusion *scsi_lookup;
        int rc;
        struct MPI2_SCSI_TASK_MANAGE_REPLY *mpi_reply;
@@ -3781,8 +3781,6 @@ static int megasas_track_scsiio(struct megasas_instance 
*instance,
        cmd_fusion->request_desc = req_desc;
        req_desc->Words = 0;
 
-       scsi_lookup = fusion->cmd_list[smid_task - 1];
-
        mr_request = (struct MR_TASK_MANAGE_REQUEST *) cmd_fusion->io_request;
        memset(mr_request, 0, sizeof(struct MR_TASK_MANAGE_REQUEST));
        mpi_request = (struct MPI2_SCSI_TASK_MANAGE_REQUEST *) 
&mr_request->TmRequest;
@@ -3829,6 +3827,8 @@ static int megasas_track_scsiio(struct megasas_instance 
*instance,
        rc = SUCCESS;
        switch (type) {
        case MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK:
+               scsi_lookup = fusion->cmd_list[smid_task - 1];
+
                if (scsi_lookup->scmd == NULL)
                        break;
                else {
-- 
1.8.3.1

Reply via email to