From 682d7ab8845cd603378bd535684babaf539e1b6f Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Thu, 2 Jan 2014 08:02:57 +0000 Subject: [PATCH] Minor correction for the XHCI reset logic. MFC after: 1 week Found by: Horse Ma --- sys/dev/usb/controller/xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 7ce437621837..133fa51e150d 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; }