Merge branch 'for-usb-linus' of... (00b150b1) · Commits · 戴 / test

Merge branch 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus * 'for-usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci: xhci: Fix USB 3.0 device restart on resume.

drivers/usb/host/xhci-ring.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1204,6 +1204,7 @@ static void handle_vendor_event(struct xhci_hcd *xhci,
		*
		* Returns a zero-based port number, which is suitable for indexing into each of
		* the split roothubs' port arrays and bus state arrays.
		* Add one to it in order to call xhci_find_slot_id_by_port.
		*/
		static unsigned int find_faked_portnum_from_hw_portnum(struct usb_hcd *hcd,
		struct xhci_hcd *xhci, u32 port_id)
		@@ -1324,7 +1325,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
		xhci_set_link_state(xhci, port_array, faked_port_index,
		XDEV_U0);
		slot_id = xhci_find_slot_id_by_port(hcd, xhci,
		faked_port_index);
		faked_port_index + 1);
		if (!slot_id) {
		xhci_dbg(xhci, "slot_id is zero\n");
		goto cleanup;