1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 788da9781f80..0d90ff5fd117 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -418,13 +418,12 @@ static void acpi_processor_idle(void)
 
         cx = pr->power.state;
         if (!cx || acpi_idle_suspend) {
-                if (pm_idle_save)
-                        pm_idle_save();
-                else
+                if (pm_idle_save) {
+                        pm_idle_save(); /* enables IRQs */
+                } else {
                         acpi_safe_halt();
-
-                if (irqs_disabled())
                         local_irq_enable();
+                }
 
                 return;
         }
@@ -520,10 +519,12 @@ static void acpi_processor_idle(void)
                  * Use the appropriate idle routine, the one that would
                  * be used without acpi C-states.
                  */
-                if (pm_idle_save)
-                        pm_idle_save();
-                else
+                if (pm_idle_save) {
+                        pm_idle_save(); /* enables IRQs */
+                } else {
                         acpi_safe_halt();
+                        local_irq_enable();
+                }
 
                 /*
                  * TBD: Can't get time duration while in C1, as resumes
@@ -534,8 +535,6 @@ static void acpi_processor_idle(void)
                  *       skew otherwise.
                  */
                 sleep_ticks = 0xFFFFFFFF;
-                if (irqs_disabled())
-                        local_irq_enable();
 
                 break;