Commit 50807f22 authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove an unpaired ufshcd_scsi_unblock_requests() in err_handler() 

Commit 5586dd8e ("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 mistake.

Link: https://lore.kernel.org/r/1597798958-24322-1-git-send-email-cang@codeaurora.org


Fixes: 5586dd8e ("scsi: ufs: Fix a race condition between error handler and runtime PM ops")
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Reviewed-by: default avatarHongwu <Su&lt;hongwus@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 29707fab

drivers/scsi/ufs/ufshcd.c

+0 −1
Original line number Diff line number Diff line
@@ -5679,7 +5679,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);