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

Commit 39555625 authored by Anson Huang's avatar Anson Huang Committed by Greg Kroah-Hartman
Browse files

cpufreq: imx6q: add return value check for voltage scale 



[ Upstream commit 6ef28a04d1ccf718eee069b72132ce4aa1e52ab9 ]

Add return value check for voltage scale when ARM clock
rate change fail.

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c57911f0

drivers/cpufreq/imx6q-cpufreq.c

+6 −1
Original line number Diff line number Diff line
@@ -130,8 +130,13 @@ static int imx6q_set_target(struct cpufreq_policy *policy, unsigned int index) 
	/* Ensure the arm clock divider is what we expect */

	ret = clk_set_rate(arm_clk, new_freq * 1000);

	if (ret) {

		int ret1;



		dev_err(cpu_dev, "failed to set clock rate: %d\n", ret);

		regulator_set_voltage_tol(arm_reg, volt_old, 0);

		ret1 = regulator_set_voltage_tol(arm_reg, volt_old, 0);

		if (ret1)

			dev_warn(cpu_dev,

				 "failed to restore vddarm voltage: %d\n", ret1);

		return ret;

	}