scsi: ufs: core: Remove the ufshcd_release() in ufshcd_err_handling_prepare()
authorSEO HOYOUNG <hy50.seo@samsung.com>
Mon, 22 Jan 2024 08:33:24 +0000 (17:33 +0900)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 5 Feb 2024 21:31:18 +0000 (16:31 -0500)
If ufshcd_err_handler() is called in a suspend/resume situation,
ufs_release() can be called twice and active_reqs end up going negative.
This is because ufshcd_err_handling_prepare() and
ufshcd_err_handling_unprepare() both call ufshcd_release().

Remove superfluous call to ufshcd_release().

Signed-off-by: SEO HOYOUNG <hy50.seo@samsung.com>
Link: https://lore.kernel.org/r/20240122083324.11797-1-hy50.seo@samsung.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Can Guo <quic_cang@quicinc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/ufs/core/ufshcd.c

index c6cff4aa440a3002135dc2158f7289a39dc16f1a..d77b25b79ae3ec5c949912eb88b2433472180be0 100644 (file)
@@ -6354,7 +6354,6 @@ static void ufshcd_err_handling_prepare(struct ufs_hba *hba)
                ufshcd_hold(hba);
                if (!ufshcd_is_clkgating_allowed(hba))
                        ufshcd_setup_clocks(hba, true);
-               ufshcd_release(hba);
                pm_op = hba->is_sys_suspended ? UFS_SYSTEM_PM : UFS_RUNTIME_PM;
                ufshcd_vops_resume(hba, pm_op);
        } else {