summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-05 01:37:35 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-05 01:37:35 +0100
commit2c6f2db13a2428aa16f54f50232a589ddd5d7d01 (patch)
treef12c2f6ce3c6a541f5192aa5a2da400024015fb7 /drivers/usb/core
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 (diff)
parentdebugfs: fix sparse warnings (diff)
downloadlinux-2c6f2db13a2428aa16f54f50232a589ddd5d7d01.tar.xz
linux-2c6f2db13a2428aa16f54f50232a589ddd5d7d01.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: debugfs: fix sparse warnings Driver core: Fix cleanup when failing device_add(). driver core: Remove dpm_sysfs_remove() from error path of device_add() PM: fix new mutex-locking bug in the PM core PM: Do not acquire device semaphores upfront during suspend kobject: properly initialize ksets sysfs: CONFIG_SYSFS_DEPRECATED fix driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index f6f19908f5f0..1f0db51190cc 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -233,7 +233,7 @@ static int ksuspend_usb_init(void)
* singlethreaded. Its job doesn't justify running on more
* than one CPU.
*/
- ksuspend_usb_wq = create_singlethread_workqueue("ksuspend_usbd");
+ ksuspend_usb_wq = create_freezeable_workqueue("ksuspend_usbd");
if (!ksuspend_usb_wq)
return -ENOMEM;
return 0;