diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-12 21:27:23 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2019-04-12 21:27:23 -0400 |
| commit | 17631462cd49f3dfa9db38a9e578c59f71ccf414 (patch) | |
| tree | 0e44caf23bacf31cea3b414132db94ba92bd7e34 /drivers/scsi/lpfc | |
| parent | 4b3766ec0e1840f45bc9238e7e749922bdcb7016 (diff) | |
| parent | 5c2442fd78998af60e13aba506d103f7f43f8701 (diff) | |
| download | linux-17631462cd49f3dfa9db38a9e578c59f71ccf414.tar.gz linux-17631462cd49f3dfa9db38a9e578c59f71ccf414.tar.bz2 linux-17631462cd49f3dfa9db38a9e578c59f71ccf414.zip | |
Merge branch '5.1/scsi-fixes' into 5.2/merge
We have a few submissions for 5.2 that depend on fixes merged post
5.1-rc1. Merge the fixes branch into queue.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 08644e1951cd..ba996fbde89b 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -3878,10 +3878,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, * wake up the thread. */ spin_lock(&lpfc_cmd->buf_lock); - if (unlikely(lpfc_cmd->cur_iocbq.iocb_flag & LPFC_DRIVER_ABORTED)) { - lpfc_cmd->cur_iocbq.iocb_flag &= ~LPFC_DRIVER_ABORTED; - if (lpfc_cmd->waitq) - wake_up(lpfc_cmd->waitq); + lpfc_cmd->cur_iocbq.iocb_flag &= ~LPFC_DRIVER_ABORTED; + if (lpfc_cmd->waitq) { + wake_up(lpfc_cmd->waitq); lpfc_cmd->waitq = NULL; } spin_unlock(&lpfc_cmd->buf_lock); |