[PATCH RFC] Suppress power button event on S3 resume

[Arnaud Patard <apatard@mandriva.com>]

[-- Attachment #1: Type: text/plain, Size: 249 bytes --]


Hi,

I got this week-end the problem described by the thread "how to back
from suspend without shutdown". I've hacked a little patch for solving
this issue. I've tested with the 2.6.17rc1 on two platforms and it's
working.

Regards,
Arnaud Patard


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: suppress_power_button_event_on_s3_resume.patch --]
[-- Type: text/x-patch, Size: 751 bytes --]

Suppress POWER_BUTTON event on S3 resume.

Signed-off-by: Arnaud Patard <apatard@mandriva.com>

 ---

Index: linux-2.6/drivers/acpi/sleep/main.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/main.c
+++ linux-2.6/drivers/acpi/sleep/main.c
@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t
 	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");