diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-15 05:51:29 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-15 05:51:29 +0300 |
| commit | ac2beb4e3bd75b0049068516b9d42201bda0ded3 (patch) | |
| tree | 09cedfe4495364c2e1114370e282b6028079a565 /drivers/scsi/pm8001/pm8001_sas.c | |
| parent | 22754f7fbb4030eb2d5e73c2a2db63637ed1d105 (diff) | |
| parent | 5852ed2a6a39c862c8a3fdf646e1f4e01b91d710 (diff) | |
| download | linux-ac2beb4e3bd75b0049068516b9d42201bda0ded3.tar.xz | |
Merge branch '5.17/scsi-fixes' into 5.18/scsi-staging
Pull 5.17 fixes branch into 5.18 tree to resolve a few pm8001 driver
merge conflicts.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_sas.c')
| -rw-r--r-- | drivers/scsi/pm8001/pm8001_sas.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index b3530f53df25..8c12fbb9c476 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -766,8 +766,13 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev, res = -TMF_RESP_FUNC_FAILED; /* Even TMF timed out, return direct. */ if (task->task_state_flags & SAS_TASK_STATE_ABORTED) { + struct pm8001_ccb_info *ccb = task->lldd_task; + pm8001_dbg(pm8001_ha, FAIL, "TMF task[%x]timeout.\n", tmf->tmf); + + if (ccb) + ccb->task = NULL; goto ex_err; } |