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

This commit is contained in:
qctecmdr 2020-10-12 12:03:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit cf2f4e74bf

View file

@ -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);
xhci->usb2_rhub.bus_state.port_c_suspend = 0;
xhci->usb2_rhub.bus_state.suspended_ports = 0;