projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-microblaze.git]
/
drivers
/
acpi
/
device_pm.c
diff --git
a/drivers/acpi/device_pm.c
b/drivers/acpi/device_pm.c
index
7103de0
..
143ec6e
100644
(file)
--- a/
drivers/acpi/device_pm.c
+++ b/
drivers/acpi/device_pm.c
@@
-711,7
+711,7
@@
int acpi_pm_device_run_wake(struct device *phys_dev, bool enable)
return -ENODEV;
}
- return acpi_device_wakeup(adev,
enable, ACPI_STATE_S0
);
+ return acpi_device_wakeup(adev,
ACPI_STATE_S0, enable
);
}
EXPORT_SYMBOL(acpi_pm_device_run_wake);
#endif /* CONFIG_PM_RUNTIME */