]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
cpufreq: powernow-k8: call CPUFREQ_POSTCHANGE notfier in error cases
authorViresh Kumar <viresh.kumar@linaro.org>
Wed, 19 Jun 2013 08:53:04 +0000 (14:23 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 24 Jun 2013 11:28:57 +0000 (13:28 +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 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/powernow-k8.c

index 51343a1287037ea4c43a07e7e5bc93f97222d8a4..78f018f2a5deb5db485a718068825723ffeabba1 100644 (file)
@@ -967,9 +967,9 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
 
        res = transition_fid_vid(data, fid, vid);
        if (res)
-               return res;
-
-       freqs.new = find_khz_freq_from_fid(data->currfid);
+               freqs.new = freqs.old;
+       else
+               freqs.new = find_khz_freq_from_fid(data->currfid);
 
        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
        return res;