Commit 872d83d0 authored Apr 27, 2006 by Arnaud Patard Committed by Len Brown Jun 15, 2006

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>

parent d8c3291c

drivers/acpi/sleep/main.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -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");