aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/processor_idle.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 99da6a790857..0cad56ca342b 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1416,6 +1416,9 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
1416 if (unlikely(!pr)) 1416 if (unlikely(!pr))
1417 return 0; 1417 return 0;
1418 1418
1419 if (acpi_idle_suspend)
1420 return(acpi_idle_enter_c1(dev, state));
1421
1419 if (pr->flags.bm_check) 1422 if (pr->flags.bm_check)
1420 acpi_idle_update_bm_rld(pr, cx); 1423 acpi_idle_update_bm_rld(pr, cx);
1421 1424
@@ -1477,6 +1480,9 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
1477 if (unlikely(!pr)) 1480 if (unlikely(!pr))
1478 return 0; 1481 return 0;
1479 1482
1483 if (acpi_idle_suspend)
1484 return(acpi_idle_enter_c1(dev, state));
1485
1480 local_irq_disable(); 1486 local_irq_disable();
1481 current_thread_info()->status &= ~TS_POLLING; 1487 current_thread_info()->status &= ~TS_POLLING;
1482 /* 1488 /*