Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / ufs / host / ufs-qcom.c

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 0879f5ed4e5b1161f05178ef1373cb115be23d5f..39eef470f8fa5b88b41450aeec8833a619899e34 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1303,9 +1303,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);