diff options
| author | Rafael J. Wysocki | 2008-07-07 03:33:34 +0200 |
|---|---|---|
| committer | Jesse Barnes | 2008-07-08 01:25:57 +0200 |
| commit | 77e766099efc29d8b01db4b8244ff64fa3d3d0ca (patch) | |
| tree | 6868acb2376388e5c02ed45a685ac31cc31a0bb1 /drivers/acpi/sleep | |
| parent | PCI: rework pci_set_power_state function to call platform first (diff) | |
| download | kernel-qcow2-linux-77e766099efc29d8b01db4b8244ff64fa3d3d0ca.tar.gz kernel-qcow2-linux-77e766099efc29d8b01db4b8244ff64fa3d3d0ca.tar.xz kernel-qcow2-linux-77e766099efc29d8b01db4b8244ff64fa3d3d0ca.zip | |
ACPI: Introduce acpi_device_sleep_wake function
The currect ACPI code attempts to execute _PSW at three different
places and in one of them only it tries to execute _DSW before _PSW,
which is inconsistent with the other two cases.
Move the execution of _DSW and _PSW into a separate function called
acpi_device_sleep_wake() and call it wherever appropriate instead of
executing _DSW and/or _PSW directly.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/acpi/sleep')
| -rw-r--r-- | drivers/acpi/sleep/wakeup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c index ed8e41becf0c..7422a2213944 100644 --- a/drivers/acpi/sleep/wakeup.c +++ b/drivers/acpi/sleep/wakeup.c @@ -42,7 +42,7 @@ void acpi_enable_wakeup_device_prep(u8 sleep_state) continue; spin_unlock(&acpi_device_lock); - acpi_enable_wakeup_device_power(dev); + acpi_enable_wakeup_device_power(dev, sleep_state); spin_lock(&acpi_device_lock); } spin_unlock(&acpi_device_lock); |