diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:20:05 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:20:05 -0400 |
| commit | 4538fad56ee1c16bce0294b5647d2551f0e03164 (patch) | |
| tree | bbfe1b95eb38f2cf160c6521dc32f9a9dbc82cd2 /drivers/acpi | |
| parent | ebd7e45f6d27556c94216024212a462aaf899ecb (diff) | |
| parent | 89cedfefca1d446ee2598fd3bcbb23ee3802e26a (diff) | |
Merge branch 'cpuidle' into test
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index cf5b1b7b684f..81b40ed5379e 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, | |||
| 1587 | 1587 | ||
| 1588 | if (acpi_idle_bm_check()) { | 1588 | if (acpi_idle_bm_check()) { |
| 1589 | if (dev->safe_state) { | 1589 | if (dev->safe_state) { |
| 1590 | dev->last_state = dev->safe_state; | ||
| 1590 | return dev->safe_state->enter(dev, dev->safe_state); | 1591 | return dev->safe_state->enter(dev, dev->safe_state); |
| 1591 | } else { | 1592 | } else { |
| 1592 | local_irq_disable(); | 1593 | local_irq_disable(); |