1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 2e3148499368..5bed73329ef8 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -57,7 +57,11 @@ static void cpuidle_idle_call(void)
                 if (pm_idle_old)
                         pm_idle_old();
                 else
+#if defined(CONFIG_ARCH_HAS_DEFAULT_IDLE)
+                        default_idle();
+#else
                         local_irq_enable();
+#endif
                 return;
         }
 
@@ -74,8 +78,11 @@ static void cpuidle_idle_call(void)
         target_state = &dev->states[next_state];
 
         /* enter the state and update stats */
-        dev->last_residency = target_state->enter(dev, target_state);
         dev->last_state = target_state;
+        dev->last_residency = target_state->enter(dev, target_state);
+        if (dev->last_state)
+                target_state = dev->last_state;
+
         target_state->time += (unsigned long long)dev->last_residency;
         target_state->usage++;