[PATCH v3] scsi: ufs: qcom: Return ufs_qcom_clk_scale_*() errors in ufs_qcom_clk_scale_notify()

From: Chanwoo Lee
Date: Thu Dec 14 2023 - 19:45:08 EST


From: ChanWoo Lee <cw9316.lee@xxxxxxxxxxx>

In commit 031312dbc695 ("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;

Let's make sure those errors are properly returned.

Fixes: 031312dbc695 ("scsi: ufs: ufs-qcom: Remove unnecessary goto statements")
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
Signed-off-by: ChanWoo Lee <cw9316.lee@xxxxxxxxxxx>
---
* v2->v3: Change title and description
v2 :
https://patchwork.kernel.org/project/linux-scsi/patch/20231214021401.26474-1-cw9316.lee@xxxxxxxxxxx/

* v1->v2: Remove things already in progress
v1 :
https://patchwork.kernel.org/project/linux-scsi/patch/20231213022500.9011-1-cw9316.lee@xxxxxxxxxxx/
---
---
drivers/ufs/host/ufs-qcom.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 96cb8b5b4e66..17e24270477d 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1516,9 +1516,11 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba,
err = ufs_qcom_clk_scale_up_pre_change(hba);
else
err = ufs_qcom_clk_scale_down_pre_change(hba);
- if (err)
- ufshcd_uic_hibern8_exit(hba);

+ if (err) {
+ ufshcd_uic_hibern8_exit(hba);
+ return err;
+ }
} else {
if (scale_up)
err = ufs_qcom_clk_scale_up_post_change(hba);
--
2.29.0