diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2012-12-04 23:23:16 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:43:58 -0800 |
| commit | 4a6cf0c4f4f8465d61adbf3aaaec2bd100e30d97 (patch) | |
| tree | 2bf1b1faef6349d2d0fb75e8ca5aa56d7620c10a /drivers/acpi | |
| parent | 5e3fe67e02c53e5a5fcf0e2b0d91dd93f757d50b (diff) | |
| download | linux-stable-4a6cf0c4f4f8465d61adbf3aaaec2bd100e30d97.tar.gz linux-stable-4a6cf0c4f4f8465d61adbf3aaaec2bd100e30d97.tar.bz2 linux-stable-4a6cf0c4f4f8465d61adbf3aaaec2bd100e30d97.zip | |
ACPI : do not use Lid and Sleep button for S5 wakeup
commit b7e383046c2c7c13ad928cd7407eafff758ddd4b upstream.
When system enters power off, the _PSW of Lid device is enabled.
But this may cause the system to reboot instead of power off.
A proper way to fix this is to always disable lid wakeup capability for S5.
References: https://bugzilla.kernel.org/show_bug.cgi?id=35262
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Joseph Salisbury <joseph.salisbury@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 8cb97421173b..ea1fe0a2d378 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -789,8 +789,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle, static void acpi_bus_set_run_wake_flags(struct acpi_device *device) { struct acpi_device_id button_device_ids[] = { - {"PNP0C0D", 0}, {"PNP0C0C", 0}, + {"PNP0C0D", 0}, {"PNP0C0E", 0}, {"", 0}, }; @@ -802,6 +802,11 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device) /* Power button, Lid switch always enable wakeup */ if (!acpi_match_device_ids(device, button_device_ids)) { device->wakeup.flags.run_wake = 1; + if (!acpi_match_device_ids(device, &button_device_ids[1])) { + /* Do not use Lid/sleep button for S5 wakeup */ + if (device->wakeup.sleep_state == ACPI_STATE_S5) + device->wakeup.sleep_state = ACPI_STATE_S4; + } device_set_wakeup_capable(&device->dev, true); return; } |