[src/netbsd-8]: src/sys/dev/usb Pull up following revision(s) (requested by m...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6e685da7e24
branches:  netbsd-8
changeset: 447234:d6e685da7e24
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 04 14:55:40 2019 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1155):

        sys/dev/usb/xhci.c: revision 1.100

use xhci_polling_p().  this might miss when bus2 is active.
XXX: pullup-7, pullup-8.

diffstat:

 sys/dev/usb/xhci.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r dcf4e2f78972 -r d6e685da7e24 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Thu Jan 03 11:27:32 2019 +0000
+++ b/sys/dev/usb/xhci.c        Fri Jan 04 14:55:40 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.72.2.9 2018/09/28 08:33:43 martin Exp $     */
+/*     $NetBSD: xhci.c,v 1.72.2.10 2019/01/04 14:55:40 martin Exp $    */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.9 2018/09/28 08:33:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.72.2.10 2019/01/04 14:55:40 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -3711,7 +3711,7 @@
 {
        struct xhci_softc * const sc = XHCI_XFER2SC(xfer);
        const size_t bn = XHCI_XFER2BUS(xfer) == &sc->sc_bus ? 0 : 1;
-       const bool polling = sc->sc_bus.ub_usepolling;
+       const bool polling = xhci_polling_p(sc);
 
        XHCIHIST_FUNC(); XHCIHIST_CALLED();
 
@@ -3803,7 +3803,7 @@
        uint32_t status;
        uint32_t control;
        u_int i;
-       const bool polling = sc->sc_bus.ub_usepolling;
+       const bool polling = xhci_polling_p(sc);
 
        XHCIHIST_FUNC(); XHCIHIST_CALLED();
        DPRINTFN(12, "req: %04jx %04jx %04jx %04jx",
@@ -3937,7 +3937,7 @@
        uint32_t status;
        uint32_t control;
        u_int i = 0;
-       const bool polling = sc->sc_bus.ub_usepolling;
+       const bool polling = xhci_polling_p(sc);
 
        XHCIHIST_FUNC(); XHCIHIST_CALLED();