2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
index 9f08e8cce1af..044ee0df5871 100644
--- a/drivers/cpuidle/governors/ladder.c
+++ b/drivers/cpuidle/governors/ladder.c
@@ -144,7 +144,7 @@ static int ladder_enable_device(struct cpuidle_driver *drv,
 
         ldev->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
-        for (i = 0; i < drv->state_count; i++) {
+        for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) {
                 state = &drv->states[i];
                 lstate = &ldev->states[i];
 
@@ -156,7 +156,7 @@ static int ladder_enable_device(struct cpuidle_driver *drv,
 
                 if (i < drv->state_count - 1)
                         lstate->threshold.promotion_time = state->exit_latency;
-                if (i > 0)
+                if (i > CPUIDLE_DRIVER_STATE_START)
                         lstate->threshold.demotion_time = state->exit_latency;
         }
 
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index daf850250b6a..ae5a42595e1c 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -35,7 +35,6 @@
 #define RESOLUTION 1024
 #define DECAY 8
 #define MAX_INTERESTING 50000
-#define STDDEV_THRESH 400
 
 
 /*
@@ -296,7 +295,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
                 data->needs_update = 0;
         }
 
-        data->last_state_idx = 0;
+        data->last_state_idx = CPUIDLE_DRIVER_STATE_START - 1;
 
         /* Special case when user has set very strict latency requirement */
         if (unlikely(latency_req == 0))
@@ -311,13 +310,6 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev)
         data->bucket = which_bucket(data->next_timer_us);
 
         /*
-         * if the correction factor is 0 (eg first time init or cpu hotplug
-         * etc), we actually want to start out with a unity factor.
-         */
-        if (data->correction_factor[data->bucket] == 0)
-                data->correction_factor[data->bucket] = RESOLUTION * DECAY;
-
-        /*
          * Force the result of multiplication to be 64 bits even if both
          * operands are 32 bits.
          * Make sure to round up for half microseconds.
@@ -466,9 +458,17 @@ static int menu_enable_device(struct cpuidle_driver *drv,
                                 struct cpuidle_device *dev)
 {
         struct menu_device *data = &per_cpu(menu_devices, dev->cpu);
+        int i;
 
         memset(data, 0, sizeof(struct menu_device));
 
+        /*
+         * if the correction factor is 0 (eg first time init or cpu hotplug
+         * etc), we actually want to start out with a unity factor.
+         */
+        for(i = 0; i < BUCKETS; i++)
+                data->correction_factor[i] = RESOLUTION * DECAY;
+
         return 0;
 }