Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / cpufreq / powernow-k8.c

diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 0023c7d..e10b646 100644 (file)
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -964,14 +964,9 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data,
        cpufreq_cpu_put(policy);
 
        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
-
        res = transition_fid_vid(data, fid, vid);
-       if (res)
-               freqs.new = freqs.old;
-       else
-               freqs.new = find_khz_freq_from_fid(data->currfid);
+       cpufreq_notify_post_transition(policy, &freqs, res);
 
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
        return res;
 }