diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2008-09-12 11:12:25 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-06 22:31:11 -0400 |
| commit | faee816b1502385dc9bc5abf2960d1cc645844d1 (patch) | |
| tree | 05302f1ae80091814aa497ca5e28c51543befebb /drivers/acpi/scan.c | |
| parent | 4330ed8ed4da360ac1ca14b0fddff4c05b10de16 (diff) | |
| download | linux-faee816b1502385dc9bc5abf2960d1cc645844d1.tar.gz linux-faee816b1502385dc9bc5abf2960d1cc645844d1.tar.bz2 linux-faee816b1502385dc9bc5abf2960d1cc645844d1.zip | |
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>
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index f6f52c1a2aba..5ce14aee5e3f 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -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; |