git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
acpi
/
scan.c
diff --git
a/drivers/acpi/scan.c
b/drivers/acpi/scan.c
index
0338f51
..
7f2e051
100644
(file)
--- a/
drivers/acpi/scan.c
+++ b/
drivers/acpi/scan.c
@@
-765,7
+765,7
@@
static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
}
status = acpi_get_gpe_status(NULL, device->wakeup.gpe_number,
-
ACPI_NOT_ISR,
&event_status);
+ &event_status);
if (status == AE_OK)
device->wakeup.flags.run_wake =
!!(event_status & ACPI_EVENT_FLAG_HANDLE);