Commit 9264fd61 authored by ChanWoo Lee's avatar ChanWoo Lee Committed by Martin K. Petersen
Browse files

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



In commit 031312db ("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: 031312db ("scsi: ufs: ufs-qcom: Remove unnecessary goto statements")
Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarChanWoo Lee <cw9316.lee@samsung.com>
Link: https://lore.kernel.org/r/20231215003812.29650-1-cw9316.lee@samsung.com


Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 066c5b46

drivers/ufs/host/ufs-qcom.c

+4 −2
Original line number Diff line number Diff line
@@ -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);