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

Commit 2e0e4194 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: core: Replace msleep with usleep_range"

parents 73b0adc8 dd914d68

drivers/usb/core/hub.c

+3 −2
Original line number Diff line number Diff line
@@ -3487,7 +3487,8 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) 
		/* drive resume for USB_RESUME_TIMEOUT msec */

		dev_dbg(&udev->dev, "usb %sresume\n",

				(PMSG_IS_AUTO(msg) ? "auto-" : ""));

		msleep(USB_RESUME_TIMEOUT);

		usleep_range(USB_RESUME_TIMEOUT * 1000,

				(USB_RESUME_TIMEOUT + 1) * 1000);



		/* Virtual root hubs can trigger on GET_PORT_STATUS to

		 * stop resume signaling.  Then finish the resume
@@ -3496,7 +3497,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) 
		status = hub_port_status(hub, port1, &portstatus, &portchange);



		/* TRSMRCY = 10 msec */

		msleep(10);

		usleep_range(10000, 10500);

	}



 SuspendCleared:

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -1340,7 +1340,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
				xhci_set_link_state(xhci, ports[wIndex],

						    XDEV_RESUME);

				spin_unlock_irqrestore(&xhci->lock, flags);

				msleep(USB_RESUME_TIMEOUT);

				usleep_range(21000, 21500);

				spin_lock_irqsave(&xhci->lock, flags);

				xhci_set_link_state(xhci, ports[wIndex],

							XDEV_U0);