Merge tag 'v3.10.85' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / cpuidle / governors / menu.c

diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index 33305fb3d5fcd7c06a1af2d9c862d70c47382e30..16e8a59bcf78601f9176ec5bb2cc060f541854fe 100644 (file)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -274,7 +274,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;
        data->exit_us = 0;
 
        /* Special case when user has set very strict latency requirement */