Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb9e7391 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: fix a race condition between clock scaling and UFS card removal"

parents 41aa58a6 d8f9875c

drivers/scsi/ufs/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -1806,7 +1806,7 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up) 
		ret = ufshcd_uic_hibern8_enter(hba);

		if (ret)

			/* link will be bad state so no need to scale_up_gear */

			return ret;

			goto clk_scaling_unprepare;

		ufshcd_custom_cmd_log(hba, "Hibern8-entered");

	}
@@ -1819,7 +1819,7 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up) 
		ret = ufshcd_uic_hibern8_exit(hba);

		if (ret)

			/* link will be bad state so no need to scale_up_gear */

			return ret;

			goto clk_scaling_unprepare;

		ufshcd_custom_cmd_log(hba, "Hibern8-Exited");

	}