]> git.karo-electronics.de Git - linux-beck.git/commitdiff
cpufreq: pcc: call CPUFREQ_POSTCHANGE notfier in error cases
authorViresh Kumar <viresh.kumar@linaro.org>
Wed, 19 Jun 2013 08:53:03 +0000 (14:23 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Jun 2013 11:26:39 +0000 (13:26 +0200)
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 the sequence of calling notifiers is complete.

This patch fixes it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/pcc-cpufreq.c

index 0de00081a81e9b636d42a282123f902838a1e306..1581fcc4cf4a9f3cf8de7b782abe932328584ef0 100644 (file)
@@ -243,6 +243,8 @@ static int pcc_cpufreq_target(struct cpufreq_policy *policy,
        return 0;
 
 cmd_incomplete:
+       freqs.new = freqs.old;
+       cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
        iowrite16(0, &pcch_hdr->status);
        spin_unlock(&pcc_lock);
        return -EINVAL;