aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2007-06-19 21:17:58 -0400
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:55 -0500
commita3627f67b1d5ddd8f65eedc2a76da90fbe062530 (patch)
treee04a54df6697c27f58eb32a062e984d583eaf9b0 /drivers/acpi
parentf4cb57007662a4ec3c2de3c027900223e0299bdd (diff)
ACPI: clear GPE earily in resume to avoid warning
Wakeup GPE hasn't a handler. If system is waked up by such GPE like a USB hotplug, I saw a lot of error reporting the GPE hasn't handler. acpi_leave_sleep_state will clear the GPE but it's too late, we should do it before interrupt is re-enabled. Signed-off-by: Shaohua Li <shaohua.li@intel.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index cbfa058d89e3..96d23b3cfc4e 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -146,6 +146,13 @@ static int acpi_pm_enter(suspend_state_t pm_state)
146 if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3)) 146 if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3))
147 acpi_clear_event(ACPI_EVENT_POWER_BUTTON); 147 acpi_clear_event(ACPI_EVENT_POWER_BUTTON);
148 148
149 /*
150 * Disable and clear GPE status before interrupt is enabled. Some GPEs
151 * (like wakeup GPE) haven't handler, this can avoid such GPE misfire.
152 * acpi_leave_sleep_state will reenable specific GPEs later
153 */
154 acpi_hw_disable_all_gpes();
155
149 local_irq_restore(flags); 156 local_irq_restore(flags);
150 printk(KERN_DEBUG "Back to C!\n"); 157 printk(KERN_DEBUG "Back to C!\n");
151 158