|
@@ -917,8 +917,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},
|
|
|
};
|
|
@@ -930,6 +930,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;
|
|
|
}
|