Merge "usb: xhci: clean up command queue when halting" into msm-4.9 (4f4dc0b3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/host/xhci.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,13 @@ int xhci_halt(struct xhci_hcd *xhci)
		if (!ret) {
		xhci->xhc_state \|= XHCI_STATE_HALTED;
		xhci->cmd_ring_state = CMD_RING_STATE_STOPPED;

		if (delayed_work_pending(&xhci->cmd_timer)) {
		xhci_dbg_trace(xhci, trace_xhci_dbg_init,
		"Cleanup command queue");
		cancel_delayed_work(&xhci->cmd_timer);
		xhci_cleanup_command_queue(xhci);
		}
		} else
		xhci_warn(xhci, "Host not halted after %u microseconds.\n",
		XHCI_MAX_HALT_USEC);