diff options
| author | Zang Leigang | 2017-06-24 13:14:32 +0200 |
|---|---|---|
| committer | Martin K. Petersen | 2017-07-01 22:51:23 +0200 |
| commit | 8dc0da7981a3f9680c873e92e3ec17308377e3b9 (patch) | |
| tree | 885428a5fe47f61a6867ee9dc7dd91623ae479a4 | |
| parent | scsi: qla2xxx: Protect access to qpair members with qpair->qp_lock (diff) | |
| download | kernel-qcow2-linux-8dc0da7981a3f9680c873e92e3ec17308377e3b9.tar.gz kernel-qcow2-linux-8dc0da7981a3f9680c873e92e3ec17308377e3b9.tar.xz kernel-qcow2-linux-8dc0da7981a3f9680c873e92e3ec17308377e3b9.zip | |
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>
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 88ccd63f83c1..5bc9dc14e075 100644 --- 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__); |