Merge tag 'v3.10.102' into update

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

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index c3a93fece819e71adb5fcae2acd84f885c0f2583..5b11022d7745669a2288dfd778601a2041e8c314 100644 (file)
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -135,6 +135,9 @@ int cpuidle_idle_call(void)
 
        /* ask the governor for the next state */
        next_state = cpuidle_curr_governor->select(drv, dev);
+       if (next_state < 0)
+               return -EBUSY;
+
        if (need_resched()) {
                dev->last_residency = 0;
                /* give the governor an opportunity to reflect on the outcome */