summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:20:05 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:20:05 -0400
commit4538fad56ee1c16bce0294b5647d2551f0e03164 (patch)
treebbfe1b95eb38f2cf160c6521dc32f9a9dbc82cd2 /drivers/acpi
parentebd7e45f6d27556c94216024212a462aaf899ecb (diff)
parent89cedfefca1d446ee2598fd3bcbb23ee3802e26a (diff)
Merge branch 'cpuidle' into test
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index cf5b1b7b684..81b40ed5379 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1587,6 +1587,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
if (acpi_idle_bm_check()) {
if (dev->safe_state) {
+ dev->last_state = dev->safe_state;
return dev->safe_state->enter(dev, dev->safe_state);
} else {
local_irq_disable();