From a478ce01c2f8987d751753e9a512788cc0d2e46b Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Thu, 14 Jan 2021 10:28:36 -0800 Subject: [PATCH] ANDROID: scsi: ufs: fix wrong merge conflict commit e5383432d92c ("scsi: ufs: Clear UAC for FFU and RPMB LUNs") in -stable merge, wrong code was added back. Let's fix it. Fixes: 7eadb0006a9b ("Merge 5.10.7 into android12-5.10") Signed-off-by: Jaegeuk Kim Change-Id: I69c8dee273194279bc7bc23f199f0ecb0e617d03 --- drivers/scsi/ufs/ufshcd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 11ccd1d2122d..41f0eaaad200 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7894,8 +7894,6 @@ out: pm_runtime_put_sync(hba->dev); ufshcd_exit_clk_scaling(hba); ufshcd_hba_exit(hba); - } else { - ufshcd_clear_ua_wluns(hba); } }