diff mbox series

[v2] scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler()

Message ID 1597798958-24322-1-git-send-email-cang@codeaurora.org
State New
Headers show
Series [v2] scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler() | expand

Commit Message

Can Guo Aug. 19, 2020, 1:02 a.m. UTC
Commit 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler
and runtime PM ops") moves the ufshcd_scsi_block_requests() inside
err_handler(), but forgets to remove the ufshcd_scsi_unblock_requests() in
the early return path. Correct the coding mistake.

Fixes: 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler and runtime PM ops")
Signed-off-by: Can Guo <cang@codeaurora.org>
Reviewed-by: Asutosh Das <asutoshd@codeaurora.org>
Reviewed-by: Hongwu Su<hongwus@codeaurora.org>
---

Change since v1:
- Added Fixes tag.

 drivers/scsi/ufs/ufshcd.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Martin K. Petersen Sept. 9, 2020, 2:17 a.m. UTC | #1
On Tue, 18 Aug 2020 18:02:29 -0700, Can Guo wrote:

> Commit 5586dd8ea250 ("scsi: ufs: Fix a race condition between error handler
> and runtime PM ops") moves the ufshcd_scsi_block_requests() inside
> err_handler(), but forgets to remove the ufshcd_scsi_unblock_requests() in
> the early return path. Correct the coding mistake.

Applied to 5.10/scsi-queue, thanks!

[1/1] scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler()
      https://git.kernel.org/mkp/scsi/c/50807f22c89f
diff mbox series

Patch

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2b55c2e..b8441ad 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5670,7 +5670,6 @@  static void ufshcd_err_handler(struct work_struct *work)
 		if (hba->ufshcd_state != UFSHCD_STATE_ERROR)
 			hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
 		spin_unlock_irqrestore(hba->host->host_lock, flags);
-		ufshcd_scsi_unblock_requests(hba);
 		return;
 	}
 	ufshcd_set_eh_in_progress(hba);