diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:43:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:43:02 -0700 |
| commit | 37c70d0d09747a958ec50aeb11ed1bf896da028c (patch) | |
| tree | 5f026a3cfc7e4d4b11ca8cf7c787325bfb96e4e0 /drivers/acpi/hardware/hwsleep.c | |
| parent | 7f52a3afc4c02db75b3953fcbbb980abc86873a2 (diff) | |
| parent | cddece4beccaa72dcb57d64a7f1e496b2e61a16b (diff) | |
| download | talos-obmc-linux-37c70d0d09747a958ec50aeb11ed1bf896da028c.tar.gz talos-obmc-linux-37c70d0d09747a958ec50aeb11ed1bf896da028c.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: IA64: fix %ll build warnings
ACPI: IA64: fix allnoconfig build
ACPI: Only use IPI on known broken machines (AMD, Dothan/BaniasPentium M)
ACPI: ibm-acpi: allow module to load when acpi notifiers can't be set (v2)
ACPI: parse 2nd MADT by default
ACPICA: revert "acpi_serialize" changes
sony-laptop: MAINTAINERS fix entry, add L: and W:
ACPI: resolve HP nx6125 S3 immediate wakeup regression
ACPI: Add support to parse 2nd MADT
Diffstat (limited to 'drivers/acpi/hardware/hwsleep.c')
| -rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index 8fa93125fd4c..c84b1faba28c 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -300,6 +300,11 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) /* * 2) Enable all wakeup GPEs */ + status = acpi_hw_disable_all_gpes(); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } + acpi_gbl_system_awake_and_running = FALSE; status = acpi_hw_enable_all_wakeup_gpes(); |
