Merge "usb: xhci: Reduce command reset handshake timeout" (8c423eab) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/usb/host/xhci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ int xhci_reset(struct xhci_hcd *xhci)
		udelay(1000);

		ret = xhci_handshake_check_state(xhci, &xhci->op_regs->command,
		CMD_RESET, 0, 10 * 1000 * 1000);
		CMD_RESET, 0, 1000 * 1000);
		if (ret)
		return ret;

		@@ -240,7 +240,7 @@ int xhci_reset(struct xhci_hcd *xhci)
		* than status until the "Controller Not Ready" flag is cleared.
		*/
		ret = xhci_handshake(&xhci->op_regs->status,
		STS_CNR, 0, 10 * 1000 * 1000);
		STS_CNR, 0, 1000 * 1000);

		for (i = 0; i < 2; i++) {
		xhci->bus_state[i].port_c_suspend = 0;