lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB / Hub: Do not call device_set_wakeup_capable() under spinlock

Browse Source 
A subsequent patch will modify device_set_wakeup_capable() in such
a way that it will call functions which may sleep and therefore it
shouldn't be called under spinlocks.  In preparation to that, modify
usb_set_device_state() to avoid calling device_set_wakeup_capable()
under device_state_lock.

Tested-by: Minchan Kim <minchan.kim@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Rafael J. Wysocki
2011-02-08 23:25:48 +01:00
parent 0295a34d61
commit 4681b17154
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/usb/core/hub.c
View File

@@ -1465,6 +1465,7 @@ void usb_set_device_state(struct usb_device *udev,
enum usb_device_state new_state) enum usb_device_state new_state)
{ {
unsigned long flags; unsigned long flags;
int wakeup = -1;
spin_lock_irqsave(&device_state_lock, flags); spin_lock_irqsave(&device_state_lock, flags);
if (udev->state == USB_STATE_NOTATTACHED) if (udev->state == USB_STATE_NOTATTACHED)
@@ -1479,11 +1480,10 @@ void usb_set_device_state(struct usb_device *udev,
|| new_state == USB_STATE_SUSPENDED) || new_state == USB_STATE_SUSPENDED)
; /* No change to wakeup settings */ ; /* No change to wakeup settings */
else if (new_state == USB_STATE_CONFIGURED) else if (new_state == USB_STATE_CONFIGURED)
device_set_wakeup_capable(&udev->dev, wakeup = udev->actconfig->desc.bmAttributes
(udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP;
& USB_CONFIG_ATT_WAKEUP));
else else
device_set_wakeup_capable(&udev->dev, 0); wakeup = 0;
} }
if (udev->state == USB_STATE_SUSPENDED && if (udev->state == USB_STATE_SUSPENDED &&
new_state != USB_STATE_SUSPENDED) new_state != USB_STATE_SUSPENDED)
@@ -1495,6 +1495,8 @@ void usb_set_device_state(struct usb_device *udev,
} else } else
recursively_mark_NOTATTACHED(udev); recursively_mark_NOTATTACHED(udev);
spin_unlock_irqrestore(&device_state_lock, flags); spin_unlock_irqrestore(&device_state_lock, flags);
if (wakeup >= 0)
device_set_wakeup_capable(&udev->dev, wakeup);
} }
EXPORT_SYMBOL_GPL(usb_set_device_state); EXPORT_SYMBOL_GPL(usb_set_device_state);