scsi: ufs: qcom: Return ufs_qcom_clk_scale_*() errors in ufs_qcom_clk_scale_notify()

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;

Make sure those errors are properly returned.

Fixes: 031312dbc695 ("scsi: ufs: ufs-qcom: Remove unnecessary goto statements")
Reviewed-by: Manivannan Sadhasivam <[email protected]>
Signed-off-by: ChanWoo Lee <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Reviewed-by: Andrew Halaney <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 96cb8b5b4e66f5c5c7eb23ccf8cdeccf7c8da233..17e24270477dd838dd19ab933793c0aa77511920 100644 (file)
--- 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);