Merge "usb: xhci: clean up command queue on HC halt failure as well" (9fef8719) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/host/xhci.c

+12 −9

Original line number	Diff line number	Diff line
		@@ -115,6 +115,11 @@ int xhci_halt(struct xhci_hcd *xhci)
		STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC);
		if (!ret) {
		xhci->xhc_state \|= XHCI_STATE_HALTED;
		} else {
		xhci_warn(xhci, "Host not halted after %u microseconds.\n",
		XHCI_MAX_HALT_USEC);
		}

		xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;

		if (timer_pending(&xhci->cmd_timer)) {
		@@ -123,9 +128,7 @@ int xhci_halt(struct xhci_hcd *xhci)
		del_timer(&xhci->cmd_timer);
		xhci_cleanup_command_queue(xhci);
		}
		} else
		xhci_warn(xhci, "Host not halted after %u microseconds.\n",
		XHCI_MAX_HALT_USEC);

		return ret;
		}