diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-07-08 00:42:51 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-12 14:17:19 -0400 |
| commit | e8e18c956152ec9c26c94c6401c174691a8f04e7 (patch) | |
| tree | ab9392b88f052e6782e7464ada7adffd98359199 /drivers/acpi | |
| parent | 9e6c3e996e3c80d00cf931538e17126efe45f45c (diff) | |
| download | op-kernel-dev-e8e18c956152ec9c26c94c6401c174691a8f04e7.zip op-kernel-dev-e8e18c956152ec9c26c94c6401c174691a8f04e7.tar.gz | |
ACPI: Fix bogus GPE test in acpi_bus_set_run_wake_flags()
When we check if a GPE can be used for runtime signaling, we only
search the FADT GPE blocks, which is incorrect, becuase the GPE
may be located elsewhere. We really should be using the GPE device
information previously returned by _PRW here, so make that happen.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 7f2e051..449ada0 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -764,8 +764,9 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device) return; } - status = acpi_get_gpe_status(NULL, device->wakeup.gpe_number, - &event_status); + status = acpi_get_gpe_status(device->wakeup.gpe_device, + device->wakeup.gpe_number, + &event_status); if (status == AE_OK) device->wakeup.flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HANDLE); |
