Date: Thu, 2 Jan 2014 08:02:58 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260184 - head/sys/dev/usb/controller Message-ID: <201401020802.s0282wZP084948@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Thu Jan 2 08:02:57 2014 New Revision: 260184 URL: http://svnweb.freebsd.org/changeset/base/260184 Log: Minor correction for the XHCI reset logic. MFC after: 1 week Found by: Horse Ma <HMa@wyse.com> Modified: head/sys/dev/usb/controller/xhci.c Modified: head/sys/dev/usb/controller/xhci.c ============================================================================== --- head/sys/dev/usb/controller/xhci.c Thu Jan 2 07:34:36 2014 (r260183) +++ head/sys/dev/usb/controller/xhci.c Thu Jan 2 08:02:57 2014 (r260184) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401020802.s0282wZP084948>