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

Commit 7d3b016a authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: use default USB_RESUME_TIMEOUT when resuming ports. 



USB2 host inititated resume, and system suspend bus resume
need to use the same USB_RESUME_TIMEOUT as elsewhere.

This resolves a device disconnect issue at system resume seen
on Intel Braswell and Apollolake, but is in no way limited to
those platforms.

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 346e9973

drivers/usb/host/xhci-hub.c

+2 −2
Original line number Diff line number Diff line
@@ -1166,7 +1166,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
				xhci_set_link_state(xhci, port_array, wIndex,

							XDEV_RESUME);

				spin_unlock_irqrestore(&xhci->lock, flags);

				msleep(20);

				msleep(USB_RESUME_TIMEOUT);

				spin_lock_irqsave(&xhci->lock, flags);

				xhci_set_link_state(xhci, port_array, wIndex,

							XDEV_U0);
@@ -1447,7 +1447,7 @@ int xhci_bus_resume(struct usb_hcd *hcd) 


	if (need_usb2_u3_exit) {

		spin_unlock_irqrestore(&xhci->lock, flags);

		msleep(20);

		msleep(USB_RESUME_TIMEOUT);

		spin_lock_irqsave(&xhci->lock, flags);

	}