diff --git a/[refs] b/[refs] index 497b9fe45f62..3f7d243a1ef2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e6c3e996e3c80d00cf931538e17126efe45f45c +refs/heads/master: e8e18c956152ec9c26c94c6401c174691a8f04e7 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 7f2e051ed4f1..449ada016d81 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/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);