2 files changed, 11 insertions, 4 deletions

diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index b60a4c263686..faf7c5217848 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -298,11 +298,13 @@ static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
         old_index = stat->last_index;
         new_index = freq_table_get_index(stat, freq->new);
 
-        cpufreq_stats_update(freq->cpu);
-        if (old_index == new_index)
+        /* We can't do stat->time_in_state[-1]= .. */
+        if (old_index == -1 || new_index == -1)
                 return 0;
 
-        if (old_index == -1 || new_index == -1)
+        cpufreq_stats_update(freq->cpu);
+
+        if (old_index == new_index)
                 return 0;
 
         spin_lock(&cpufreq_stats_lock);
@@ -387,6 +389,7 @@ static void __exit cpufreq_stats_exit(void)
         unregister_hotcpu_notifier(&cpufreq_stat_cpu_notifier);
         for_each_online_cpu(cpu) {
                 cpufreq_stats_free_table(cpu);
+                cpufreq_stats_free_sysfs(cpu);
         }
 }
 
diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c
index 83479b6fb9a1..bce576d7478e 100644
--- a/drivers/cpufreq/powernow-k8.c
+++ b/drivers/cpufreq/powernow-k8.c
@@ -1079,6 +1079,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);
 
         for_each_cpu(i, data->available_cores) {
@@ -1101,7 +1104,8 @@ static int transition_frequency_pstate(struct powernow_k8_data *data,
         /* get MSR index for hardware pstate transition */
         pstate = index & HW_PSTATE_MASK;
         if (pstate > data->max_hw_pstate)
-                return 0;
+                return -EINVAL;
+
         freqs.old = find_khz_freq_from_pstate(data->powernow_table,
                         data->currpstate);
         freqs.new = find_khz_freq_from_pstate(data->powernow_table, pstate);