2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 4d534582514e..b573f584b15a 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -117,6 +117,8 @@ static void enter_freeze_proper(struct cpuidle_driver *drv,
  * If there are states with the ->enter_freeze callback, find the deepest of
  * them and enter it with frozen tick.  Otherwise, find the deepest state
  * available and enter it normally.
+ *
+ * Returns with enabled interrupts.
  */
 void cpuidle_enter_freeze(void)
 {
@@ -132,6 +134,7 @@ void cpuidle_enter_freeze(void)
         index = cpuidle_find_deepest_state(drv, dev, true);
         if (index >= 0) {
                 enter_freeze_proper(drv, dev, index);
+                local_irq_enable();
                 return;
         }
 
@@ -144,9 +147,6 @@ void cpuidle_enter_freeze(void)
                 cpuidle_enter(drv, dev, index);
         else
                 arch_cpu_idle();
-
-        /* Interrupts are enabled again here. */
-        local_irq_disable();
 }
 
 /**
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 94b2d7b88a27..f59198bda1bf 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -116,7 +116,6 @@ static void cpuidle_idle_call(void)
          */
         if (idle_should_freeze()) {
                 cpuidle_enter_freeze();
-                local_irq_enable();
                 goto exit_idle;
         }