Skip to content

Commit 28661c8

Browse files
shivasharan-smartinkpetersen
authored andcommitted
scsi: megaraid_sas: Use SMID for Task abort case only
In TM code, smid_task is valid only in case of task aborts. Signed-off-by: Kashyap Desai <[email protected]> Signed-off-by: Shivasharan S <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Reviewed-by: Tomas Henzl <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 91b3d9f commit 28661c8

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/scsi/megaraid/megaraid_sas_fusion.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3760,7 +3760,7 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle,
37603760
struct megasas_cmd_fusion *cmd_fusion;
37613761
struct megasas_cmd *cmd_mfi;
37623762
union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc;
3763-
struct fusion_context *fusion;
3763+
struct fusion_context *fusion = NULL;
37643764
struct megasas_cmd_fusion *scsi_lookup;
37653765
int rc;
37663766
struct MPI2_SCSI_TASK_MANAGE_REPLY *mpi_reply;
@@ -3787,8 +3787,6 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle,
37873787
cmd_fusion->request_desc = req_desc;
37883788
req_desc->Words = 0;
37893789

3790-
scsi_lookup = fusion->cmd_list[smid_task - 1];
3791-
37923790
mr_request = (struct MR_TASK_MANAGE_REQUEST *) cmd_fusion->io_request;
37933791
memset(mr_request, 0, sizeof(struct MR_TASK_MANAGE_REQUEST));
37943792
mpi_request = (struct MPI2_SCSI_TASK_MANAGE_REQUEST *) &mr_request->TmRequest;
@@ -3835,6 +3833,8 @@ megasas_issue_tm(struct megasas_instance *instance, u16 device_handle,
38353833
rc = SUCCESS;
38363834
switch (type) {
38373835
case MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK:
3836+
scsi_lookup = fusion->cmd_list[smid_task - 1];
3837+
38383838
if (scsi_lookup->scmd == NULL)
38393839
break;
38403840
else {

0 commit comments

Comments
 (0)