projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-pm' and 'pm-genirq'
[linux-2.6-block.git]
/
drivers
/
acpi
/
device_pm.c
diff --git
a/drivers/acpi/device_pm.c
b/drivers/acpi/device_pm.c
index bea6896be1229b12d5983bb7a738db2c256fd3d1..85bb3d80a11c33adc55cb16c7ebea67d34494f23 100644
(file)
--- a/
drivers/acpi/device_pm.c
+++ b/
drivers/acpi/device_pm.c
@@
-710,7
+710,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 */