summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2014-01-11 08:21:13 +0000
committerhselasky <hselasky@FreeBSD.org>2014-01-11 08:21:13 +0000
commit2d29b474fbacf5d5fe6122a29c70411d286b784d (patch)
treea50c52a2f5a6be140e8faf952307484ef2ebcbce
parentf5cc643aac5d41bb91ac947f2257c70e8c8a353a (diff)
downloadFreeBSD-src-2d29b474fbacf5d5fe6122a29c70411d286b784d.zip
FreeBSD-src-2d29b474fbacf5d5fe6122a29c70411d286b784d.tar.gz
MFC r260184:
Minor correction for the XHCI reset logic.
-rw-r--r--sys/dev/usb/controller/xhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index b466a5a..8512693 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -386,8 +386,8 @@ xhci_start_controller(struct xhci_softc *sc)
for (i = 0; i != 100; i++) {
usb_pause_mtx(NULL, hz / 100);
- temp = XREAD4(sc, oper, XHCI_USBCMD) &
- (XHCI_CMD_HCRST | XHCI_STS_CNR);
+ temp = (XREAD4(sc, oper, XHCI_USBCMD) & XHCI_CMD_HCRST) |
+ (XREAD4(sc, oper, XHCI_USBSTS) & XHCI_STS_CNR);
if (!temp)
break;
}
OpenPOWER on IntegriCloud