diff options
author | Linus Torvalds | 2008-02-22 01:21:52 +0100 |
---|---|---|
committer | Linus Torvalds | 2008-02-22 01:21:52 +0100 |
commit | e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75 (patch) | |
tree | ce8d5b1ba0e246c32b232a09a713cf49d999971d /drivers/base/power | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 (diff) | |
parent | modules: do not try to add sysfs attributes if !CONFIG_SYSFS (diff) | |
download | kernel-qcow2-linux-e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75.tar.gz kernel-qcow2-linux-e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75.tar.xz kernel-qcow2-linux-e6364cd3a1a3e7c3e9a80bad15698afe6cc7ee75.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
modules: do not try to add sysfs attributes if !CONFIG_SYSFS
POWERPC: fix typo in pseries/power.c
PM: Remove unbalanced mutex_unlock() from dpm_resume()
UIO: fix Greg's stupid changes
stable_kernel_rules: fix must already be in mainline
ide: mark "ide=reverse" option as obsolete
Driver core: Fix error handling in bus_add_driver().
driver-core: fix kernel-doc function parameters
cpufreq: fix kobject reference count handling
slabinfo: fall back from /sys/kernel/slab to /sys/slab
Fix broken utf-8 encodings in ja_JP translation of stable_kernel_rules.txt
Diffstat (limited to 'drivers/base/power')
-rw-r--r-- | drivers/base/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index bdc03f7e8424..cea5ed3919cd 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -479,7 +479,6 @@ static int dpm_suspend(pm_message_t state) mutex_lock(&dpm_list_mtx); if (list_empty(&dev->power.entry)) list_add(&dev->power.entry, &dpm_locked); - mutex_unlock(&dpm_list_mtx); break; } mutex_lock(&dpm_list_mtx); @@ -523,6 +522,7 @@ static void lock_all_devices(void) /** * device_suspend - Save state and stop all devices in system. + * @state: new power management state * * Prevent new devices from being registered, then lock all devices * and suspend them. |