1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/cpufreq/e_powersaver.c b/drivers/cpufreq/e_powersaver.c
index 37380fb92621..a60efaeb4cf8 100644
--- a/drivers/cpufreq/e_powersaver.c
+++ b/drivers/cpufreq/e_powersaver.c
@@ -161,6 +161,9 @@ postchange:
                 current_multiplier);
         }
 #endif
+        if (err)
+                freqs.new = freqs.old;
+
         cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         return err;
 }
@@ -188,7 +191,7 @@ static int eps_target(struct cpufreq_policy *policy,
         }
 
         /* Make frequency transition */
-        dest_state = centaur->freq_table[newstate].index & 0xffff;
+        dest_state = centaur->freq_table[newstate].driver_data & 0xffff;
         ret = eps_set_state(centaur, policy, dest_state);
         if (ret)
                 printk(KERN_ERR "eps: Timeout!\n");
@@ -380,9 +383,9 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
         f_table = &centaur->freq_table[0];
         if (brand != EPS_BRAND_C7M) {
                 f_table[0].frequency = fsb * min_multiplier;
-                f_table[0].index = (min_multiplier << 8) | min_voltage;
+                f_table[0].driver_data = (min_multiplier << 8) | min_voltage;
                 f_table[1].frequency = fsb * max_multiplier;
-                f_table[1].index = (max_multiplier << 8) | max_voltage;
+                f_table[1].driver_data = (max_multiplier << 8) | max_voltage;
                 f_table[2].frequency = CPUFREQ_TABLE_END;
         } else {
                 k = 0;
@@ -391,7 +394,7 @@ static int eps_cpu_init(struct cpufreq_policy *policy)
                 for (i = min_multiplier; i <= max_multiplier; i++) {
                         voltage = (k * step) / 256 + min_voltage;
                         f_table[k].frequency = fsb * i;
-                        f_table[k].index = (i << 8) | voltage;
+                        f_table[k].driver_data = (i << 8) | voltage;
                         k++;
                 }
                 f_table[k].frequency = CPUFREQ_TABLE_END;