Merge "usb: xhci: Reduce command abort handshake timeout"

			&xhci->op_regs->cmd_ring);

	/* Section 4.6.1.2 of xHCI 1.0 spec says software should

	 * time the completion od all xHCI commands, including

	 * time the completion of all xHCI commands, including

	 * the Command Abort operation. If software doesn't see

	 * CRR negated in a timely manner (e.g. longer than 5

	 * seconds), then it should assume that the there are

	 * larger problems with the xHC and assert HCRST.

	 * CRR negated in a timely manner, then it should assume

	 * that the there are larger problems with the xHC and assert HCRST.

	 */

	ret = xhci_handshake_check_state(xhci, &xhci->op_regs->cmd_ring,

			CMD_RING_RUNNING, 0, 5 * 1000 * 1000);

			CMD_RING_RUNNING, 0, 1000 * 1000);

	if (ret < 0) {

		xhci_err(xhci,

			 "Stop command ring failed, maybe the host is dead\n");