OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: don't enable control method power button as wakeup device when Fixed Power button is used 

don't enable control method power button as wakeup device
when Fixed Power button is used.

http://bugzilla.kernel.org/show_bug.cgi?id=10503

Tested-by: walken@zoy.org <walken@zoy.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Zhang Rui 2008-09-12 11:12:25 +08:00 committed by Len Brown
parent 4330ed8ed4
commit faee816b15
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/acpi/scan.c
View File

@ -744,6 +744,16 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
if (!acpi_match_device_ids(device, button_device_ids))
device->wakeup.flags.run_wake = 1;
/*
* Don't set Power button GPE as run_wake
* if Fixed Power button is used
*/
if (!strcmp(device->pnp.hardware_id, "PNP0C0C") &&
!(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) {
device->wakeup.flags.run_wake = 0;
device->wakeup.flags.valid = 0;
}
end:
if (ACPI_FAILURE(status))
device->flags.wake_capable = 0;