summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorAnson Huang <anson.huang@nxp.com>2018-11-05 01:59:28 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-11-07 13:31:07 +0100
commit6ef28a04d1ccf718eee069b72132ce4aa1e52ab9 (patch)
treef0f1d9497ae259154ad2c5fd329a3b4cb2a8be0e /drivers/cpufreq
parentDocumentation: cpu-freq: Frequencies aren't always sorted (diff)
downloadlinux-6ef28a04d1ccf718eee069b72132ce4aa1e52ab9.tar.xz
linux-6ef28a04d1ccf718eee069b72132ce4aa1e52ab9.zip
cpufreq: imx6q: add return value check for voltage scale
Add return value check for voltage scale when ARM clock rate change fail. Signed-off-by: Anson Huang <Anson.Huang@nxp.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/imx6q-cpufreq.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
index 8cfee0ab804b..d8c3595e9023 100644
--- a/drivers/cpufreq/imx6q-cpufreq.c
+++ b/drivers/cpufreq/imx6q-cpufreq.c
@@ -160,8 +160,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(clks[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;
}