| Message ID | f88ce5f93929a780ff63df1fc73c03a0703b2af0.1371630975.git.viresh.kumar@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Jun 19, 2013 at 10:52 AM, Viresh Kumar <viresh.kumar@linaro.org> wrote: > 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. > > Cc: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Looks good to me. Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/cpufreq/dbx500-cpufreq.c b/drivers/cpufreq/dbx500-cpufreq.c index 6ec6539..1fdb02b 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)
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. Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/dbx500-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)