git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
sleep.c
diff --git
a/drivers/acpi/sleep.c
b/drivers/acpi/sleep.c
index 88561029cca83915bffd7cc1d59e03f28d1fbfb4..23a53c013f1eb6e594591189deb83c4e3f749301 100644
(file)
--- a/
drivers/acpi/sleep.c
+++ b/
drivers/acpi/sleep.c
@@
-143,7
+143,7
@@
void __init acpi_old_suspend_ordering(void)
static int acpi_pm_freeze(void)
{
acpi_disable_all_gpes();
- acpi_os_wait_events_complete(
NULL
);
+ acpi_os_wait_events_complete();
acpi_ec_block_transactions();
return 0;
}