diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
| commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
| tree | 8f7f591754baa934a842357e75e773a525bfb147 /drivers/acpi/sleep/main.c | |
| parent | f6ab0b922c3423b88c0e6e3e2c5fc1e58d83055d (diff) | |
| parent | 54866f032307063776b4eff7eadb131d47f9f9b4 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'drivers/acpi/sleep/main.c')
| -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 f3d3867303e..2c0b6630f8b 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); } |