diff options
| author | Arnaud Patard <apatard@mandriva.com> | 2006-04-27 05:25:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 23:16:05 -0400 |
| commit | 872d83d00f67021e036d75aab3b7c6e3fc7e29ee (patch) | |
| tree | 54d3940f3de7f97f3773973acdfd0a48d10a796d /drivers/acpi/sleep | |
| parent | d8c3291c73b958243b33f8509d4507e76dafd055 (diff) | |
| download | op-kernel-dev-872d83d00f67021e036d75aab3b7c6e3fc7e29ee.zip op-kernel-dev-872d83d00f67021e036d75aab3b7c6e3fc7e29ee.tar.gz | |
ACPI: suppress power button event on S3 resume
http://bugzilla.kernel.org/show_bug.cgi?id=6612
Note that this fix depends on a fix in ACPICA 20060608
to replace a semaphore with a spin-lock.
Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Acked-by: "Yu, Luming" <luming.yu@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 930427f..62ce87d 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t pm_state) default: return -EINVAL; } + + /* ACPI 3.0 specs (P62) says that it's the responsabilty + * of the OSPM to clear the status bit [ implying that the + * POWER_BUTTON event should not reach userspace ] + */ + if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3)) + acpi_clear_event(ACPI_EVENT_POWER_BUTTON); + local_irq_restore(flags); printk(KERN_DEBUG "Back to C!\n"); |
