diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2013-06-19 09:48:20 +0400 |
|---|---|---|
| committer | Viresh Kumar <viresh.kumar@linaro.org> | 2013-06-24 16:48:59 +0400 |
| commit | 803c126af699602561a3ddb1814354993e4395b6 (patch) | |
| tree | 68e0452b45fc95c4e2fbc07654aa89d9a24c9068 /drivers/cpufreq/dbx500-cpufreq.c | |
| parent | f20b97d9faed5b5e0c57fcf921297a92723a85da (diff) | |
| download | linux-803c126af699602561a3ddb1814354993e4395b6.tar.xz | |
cpufreq: dbx500: call CPUFREQ_POSTCHANGE notfier in error cases
PRECHANGE and POSTCHANGE notifiers must be called in groups, i.e either both
should be called or both shouldn't be.
In case we have started PRECHANGE notifier and found an error, we must call
POSTCHANGE notifier with freqs.new = freqs.old to guarantee that sequence of
calling notifiers is complete.
This patch fixes it.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'drivers/cpufreq/dbx500-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/dbx500-cpufreq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c index 6ec6539ae041..1fdb02b9f1ec 100644 --- a/drivers/cpufreq/dbx500-cpufreq.c +++ b/drivers/cpufreq/dbx500-cpufreq.c @@ -57,13 +57,13 @@ static int dbx500_cpufreq_target(struct cpufreq_policy *policy, if (ret) { pr_err("dbx500-cpufreq: Failed to set armss_clk to %d Hz: error %d\n", freqs.new * 1000, ret); - return ret; + freqs.new = freqs.old; } /* post change notification */ cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); - return 0; + return ret; } static unsigned int dbx500_cpufreq_getspeed(unsigned int cpu) |