github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: scsi: ufs: fix wrong merge conflict

Browse Source 
commit e5383432d9 ("scsi: ufs: Clear UAC for FFU and RPMB LUNs") in -stable
merge, wrong code was added back.
Let's fix it.

Fixes: 7eadb0006a ("Merge 5.10.7 into android12-5.10")
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I69c8dee273194279bc7bc23f199f0ecb0e617d03
This commit is contained in:
Jaegeuk Kim 2021-01-14 10:28:36 -08:00
parent 1f7c7b74e3
commit a478ce01c2
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/ufs/ufshcd.c
View File

@ -7894,8 +7894,6 @@ static void ufshcd_async_scan(void *data, async_cookie_t cookie)
pm_runtime_put_sync(hba->dev);
ufshcd_exit_clk_scaling(hba);
ufshcd_hba_exit(hba);
} else {
ufshcd_clear_ua_wluns(hba);
}
}