Merge "usb: XHCI: Bailout command abort operation upon XHCI remove" (72230b09) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/host/xhci-ring.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -340,14 +340,14 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
		* seconds), then it should assume that the there are
		* larger problems with the xHC and assert HCRST.
		*/
		ret = xhci_handshake(&xhci->op_regs->cmd_ring,
		ret = xhci_handshake_check_state(xhci, &xhci->op_regs->cmd_ring,
		CMD_RING_RUNNING, 0, 5 * 1000 * 1000);
		if (ret < 0) {
		/* we are about to kill xhci, give it one more chance */
		xhci_write_64(xhci, temp_64 \| CMD_RING_ABORT,
		&xhci->op_regs->cmd_ring);
		udelay(1000);
		ret = xhci_handshake(&xhci->op_regs->cmd_ring,
		ret = xhci_handshake_check_state(xhci, &xhci->op_regs->cmd_ring,
		CMD_RING_RUNNING, 0, 3 * 1000 * 1000);
		if (ret < 0) {
		xhci_err(xhci, "Stopped the command ring failed, "