diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-11 22:37:22 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-11 22:37:22 -0400 |
| commit | 315480209b8e1032e63c70dafc8f4133b3c9a333 (patch) | |
| tree | a99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d /drivers/target/target_core_transport.c | |
| parent | 4cc0096e2d54bc31ead127be59e3a2d02a187ac9 (diff) | |
| parent | f0f82e2476f6adb9c7a0135cfab8091456990c99 (diff) | |
Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging
Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging
reported by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/target/target_core_transport.c')
| -rw-r--r-- | drivers/target/target_core_transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 065834480179..c26b3afc4575 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c @@ -886,7 +886,7 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) INIT_WORK(&cmd->work, success ? target_complete_ok_work : target_complete_failure_work); - if (wwn->cmd_compl_affinity == SE_COMPL_AFFINITY_CPUID) + if (!wwn || wwn->cmd_compl_affinity == SE_COMPL_AFFINITY_CPUID) cpu = cmd->cpuid; else cpu = wwn->cmd_compl_affinity; |