Skip to content

Commit 9264fd6

Browse files
ChanWoo Leemartinkpetersen
authored andcommitted
scsi: ufs: qcom: Return ufs_qcom_clk_scale_*() errors in ufs_qcom_clk_scale_notify()
In commit 031312d ("scsi: ufs: ufs-qcom: Remove unnecessary goto statements") the error handling was accidentally changed, resulting in the error of ufs_qcom_clk_scale_*() calls not being returned. This is the case I checked: ufs_qcom_clk_scale_notify -> 'ufs_qcom_clk_scale_up_/down_pre_change' error -> return 0; Make sure those errors are properly returned. Fixes: 031312d ("scsi: ufs: ufs-qcom: Remove unnecessary goto statements") Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: ChanWoo Lee <cw9316.lee@samsung.com> Link: https://lore.kernel.org/r/20231215003812.29650-1-cw9316.lee@samsung.com Reviewed-by: Andrew Halaney <ahalaney@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 066c5b4 commit 9264fd6

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/ufs/host/ufs-qcom.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,9 +1516,11 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba,
15161516
err = ufs_qcom_clk_scale_up_pre_change(hba);
15171517
else
15181518
err = ufs_qcom_clk_scale_down_pre_change(hba);
1519-
if (err)
1520-
ufshcd_uic_hibern8_exit(hba);
15211519

1520+
if (err) {
1521+
ufshcd_uic_hibern8_exit(hba);
1522+
return err;
1523+
}
15221524
} else {
15231525
if (scale_up)
15241526
err = ufs_qcom_clk_scale_up_post_change(hba);

0 commit comments

Comments
 (0)