diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-29 22:30:21 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-29 22:30:21 +0100 |
| commit | 14f7d720bb6cc60be8931ea1a0f547dc1e475b88 (patch) | |
| tree | df468cdc2d1556fdc24a023baeef4b5274baf702 /drivers/acpi/sleep | |
| parent | Revert "x86_64: allocate sparsemem memmap above 4G" (diff) | |
| parent | ACPI: use select POWER_SUPPLY for AC, BATTERY and SBS (diff) | |
| download | linux-14f7d720bb6cc60be8931ea1a0f547dc1e475b88.tar.xz linux-14f7d720bb6cc60be8931ea1a0f547dc1e475b88.zip | |
Pull alexey-fixes into release branch
Diffstat (limited to 'drivers/acpi/sleep')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index f3d3867303ec..2c0b6630f8ba 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -167,8 +167,8 @@ static void acpi_pm_finish(void) { u32 acpi_state = acpi_target_sleep_state; - acpi_leave_sleep_state(acpi_state); acpi_disable_wakeup_device(acpi_state); + acpi_leave_sleep_state(acpi_state); /* reset firmware waking vector */ acpi_set_firmware_waking_vector((acpi_physical_address) 0); @@ -272,8 +272,8 @@ static void acpi_hibernation_finish(void) * enable it here. */ acpi_enable(); - acpi_leave_sleep_state(ACPI_STATE_S4); acpi_disable_wakeup_device(ACPI_STATE_S4); + acpi_leave_sleep_state(ACPI_STATE_S4); /* reset firmware waking vector */ acpi_set_firmware_waking_vector((acpi_physical_address) 0); @@ -410,6 +410,7 @@ static void acpi_power_off(void) /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */ printk("%s called\n", __FUNCTION__); local_irq_disable(); + acpi_enable_wakeup_device(ACPI_STATE_S5); acpi_enter_sleep_state(ACPI_STATE_S5); } |