Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4681b171 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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



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: default avatarMinchan Kim <minchan.kim@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0295a34d

drivers/usb/core/hub.c

+6 −4
Original line number Diff line number Diff line
@@ -1465,6 +1465,7 @@ void usb_set_device_state(struct usb_device *udev, 
		enum usb_device_state new_state)

{

	unsigned long flags;

	int wakeup = -1;



	spin_lock_irqsave(&device_state_lock, flags);

	if (udev->state == USB_STATE_NOTATTACHED)
@@ -1479,11 +1480,10 @@ void usb_set_device_state(struct usb_device *udev, 
					|| new_state == USB_STATE_SUSPENDED)

				;	/* No change to wakeup settings */

			else if (new_state == USB_STATE_CONFIGURED)

				device_set_wakeup_capable(&udev->dev,

					(udev->actconfig->desc.bmAttributes

					 & USB_CONFIG_ATT_WAKEUP));

				wakeup = udev->actconfig->desc.bmAttributes

					 & USB_CONFIG_ATT_WAKEUP;

			else

				device_set_wakeup_capable(&udev->dev, 0);

				wakeup = 0;

		}

		if (udev->state == USB_STATE_SUSPENDED &&

			new_state != USB_STATE_SUSPENDED)
@@ -1495,6 +1495,8 @@ void usb_set_device_state(struct usb_device *udev, 
	} else

		recursively_mark_NOTATTACHED(udev);

	spin_unlock_irqrestore(&device_state_lock, flags);

	if (wakeup >= 0)

		device_set_wakeup_capable(&udev->dev, wakeup);

}

EXPORT_SYMBOL_GPL(usb_set_device_state);