svn commit: r260537 - stable/10/sys/dev/usb/controller

[Hans Petter Selasky]

Author: hselasky
Date: Sat Jan 11 08:21:13 2014
New Revision: 260537
URL: http://svnweb.freebsd.org/changeset/base/260537

Log:
  MFC r260184:
  Minor correction for the XHCI reset logic.

Modified:
  stable/10/sys/dev/usb/controller/xhci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/controller/xhci.c
==============================================================================
--- stable/10/sys/dev/usb/controller/xhci.c	Sat Jan 11 08:16:31 2014	(r260536)
+++ stable/10/sys/dev/usb/controller/xhci.c	Sat Jan 11 08:21:13 2014	(r260537)
@@ -386,8 +386,8 @@ xhci_start_controller(struct xhci_softc 
 
 	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;
 	}