From 329abc0e5093680c071be9e3709ded8bf3d52319 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 18 Jan 2023 11:37:22 -0800 Subject: [PATCH] ANDROID: scsi: ufs: Fix locking in ufshcd_queuecommand() Commit 0fd420005c3b ("Merge 5.15.89 into android14-5.15") added an rcu_read_lock() call in ufshcd_queuecommand() that is not present in the upstream kernel. Since this makes locking in ufshcd_queuecommand() unbalanced, remove that rcu_read_lock() call again. Bug: 258234315 Change-Id: I555d91fe0aaabe95c9b762848b05af6c1ffc2be4 Signed-off-by: Bart Van Assche --- drivers/ufs/core/ufshcd.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 9d137f2d6def..8032ae3d3807 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -2846,12 +2846,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) */ rcu_read_lock(); - /* - * Allows the UFS error handler to wait for prior ufshcd_queuecommand() - * calls. - */ - rcu_read_lock(); - switch (hba->ufshcd_state) { case UFSHCD_STATE_OPERATIONAL: break;