Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit faee816b15.

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

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2008-11-26 17:55:15 -05:00
parent 65df78473f
commit 3bdca1b863
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/acpi/scan.c
View file

@ -751,16 +751,6 @@ 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;