diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com> | 2007-02-10 07:30:35 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-10 07:30:35 +0100 |
| commit | ed41dab90eb40ac4911e60406bc653661f0e4ce1 (patch) | |
| tree | cc797d2d44a9193791bdf6af876c4ac0ef38f8f9 /drivers/acpi | |
| parent | [PATCH] m68knommu: use irq_handler_t for passing handler types (diff) | |
| download | linux-ed41dab90eb40ac4911e60406bc653661f0e4ce1.tar.xz linux-ed41dab90eb40ac4911e60406bc653661f0e4ce1.zip | |
ACPI: Disable GPEs in preparation for sleep.
http://bugzilla.kernel.org/show_bug.cgi?id=7887
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: Vladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index 57901ca3ade9..8fa93125fd4c 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -235,6 +235,14 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state) "While executing method _SST")); } + /* + * 1) Disable/Clear all GPEs + */ + status = acpi_hw_disable_all_gpes(); + if (ACPI_FAILURE(status)) { + return_ACPI_STATUS(status); + } + return_ACPI_STATUS(AE_OK); } @@ -290,13 +298,8 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state) } /* - * 1) Disable/Clear all GPEs * 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(); |