diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:20:01 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:20:01 -0400 |
| commit | 462af435b3d8c682eb86e79d6a42ed62d183c317 (patch) | |
| tree | fb810e916568a356586fa9452316b99d9deab780 /drivers/acpi/scan.c | |
| parent | 63e065e5d35b7ca1ba2c71a042dfb602820409b8 (diff) | |
| parent | faee816b1502385dc9bc5abf2960d1cc645844d1 (diff) | |
| download | linux-462af435b3d8c682eb86e79d6a42ed62d183c317.tar.gz linux-462af435b3d8c682eb86e79d6a42ed62d183c317.tar.bz2 linux-462af435b3d8c682eb86e79d6a42ed62d183c317.zip | |
Merge branch 'bugzilla-10503' into test
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 1f98103b53c3..3196749398ea 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -751,6 +751,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; |