diff options
| author | Anson Huang <anson.huang@nxp.com> | 2018-11-05 00:59:28 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-01 09:42:53 +0100 |
| commit | abaf1eb8132120f80071137cf5421a1c1eb7d720 (patch) | |
| tree | 30bd5932b388ba6a6c31403b38934edaa7550590 | |
| parent | 6af32ab13852790718ed3fb63cd09fc4d3e8afa3 (diff) | |
| download | linux-stable-abaf1eb8132120f80071137cf5421a1c1eb7d720.tar.gz linux-stable-abaf1eb8132120f80071137cf5421a1c1eb7d720.tar.bz2 linux-stable-abaf1eb8132120f80071137cf5421a1c1eb7d720.zip | |
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: 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/cpufreq/imx6q-cpufreq.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c index 14466a9b01c0..63d28323a29c 100644 --- a/drivers/cpufreq/imx6q-cpufreq.c +++ b/drivers/cpufreq/imx6q-cpufreq.c @@ -135,8 +135,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; } |