scsi: ufs: flush eh_work when eh_work scheduled.

Forget a condition: eh_work scheduled but do not start to work.

Signed-off-by: Zang Leigang <zangleigang@hisilicon.com>
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 88ccd63f83c1bd1b7ddb319a369217bb2c6ecaa6..5bc9dc14e075060aaacfba82a82ed21da08274f3 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5809,7 +5809,8 @@ static int ufshcd_eh_host_reset_handler(struct scsi_cmnd *cmd)
        do {
                spin_lock_irqsave(hba->host->host_lock, flags);
                if (!(work_pending(&hba->eh_work) ||
-                               hba->ufshcd_state == UFSHCD_STATE_RESET))
+                           hba->ufshcd_state == UFSHCD_STATE_RESET ||
+                           hba->ufshcd_state == UFSHCD_STATE_EH_SCHEDULED))
                        break;
                spin_unlock_irqrestore(hba->host->host_lock, flags);
                dev_dbg(hba->dev, "%s: reset in progress\n", __func__);