Commit 5b4b7a23 authored by Len Brown's avatar Len Brown

Pull button into release branch

parents 785fcccd 872d83d0
...@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t pm_state) ...@@ -105,6 +105,14 @@ static int acpi_pm_enter(suspend_state_t pm_state)
default: default:
return -EINVAL; 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); local_irq_restore(flags);
printk(KERN_DEBUG "Back to C!\n"); printk(KERN_DEBUG "Back to C!\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment