diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2006-09-26 14:50:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-28 15:36:46 -0700 |
commit | e0318ebff4d96131bb3524308b845f642e64df81 (patch) | |
tree | 20cc60b491fc9694521a48a996075e652ab9de49 /drivers/usb/core/usb.c | |
parent | 8d1a243ba5dda5c1a3cca5df8fb19ab8b138f074 (diff) | |
download | op-kernel-dev-e0318ebff4d96131bb3524308b845f642e64df81.zip op-kernel-dev-e0318ebff4d96131bb3524308b845f642e64df81.tar.gz |
USB: fix autosuspend when CONFIG_PM isn't set
This patch (as791b) fixes things up to avoid compiler warnings or
errors when CONFIG_USB_SUSPEND or CONFIG_PM isn't set.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/usb.c')
-rw-r--r-- | drivers/usb/core/usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 239f8e5..e4df9ed 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -214,10 +214,10 @@ static void usb_autosuspend_work(void *_udev) { struct usb_device *udev = _udev; - mutex_lock_nested(&udev->pm_mutex, udev->level); + usb_pm_lock(udev); udev->auto_pm = 1; usb_suspend_both(udev, PMSG_SUSPEND); - mutex_unlock(&udev->pm_mutex); + usb_pm_unlock(udev); } #else |