[src/trunk]: src/sys/dev/usb Add sc->sc_bus.use_polling || to a couple of KAS...

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

details:   https://anonhg.NetBSD.org/src/rev/8157ae084669
branches:  trunk
changeset: 789802:8157ae084669
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Sep 08 06:37:23 2013 +0000

description:
Add sc->sc_bus.use_polling || to a couple of KASSERTs

PR/46826

diffstat:

 sys/dev/usb/uhci.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r e6386c501f77 -r 8157ae084669 sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Sun Sep 08 04:37:17 2013 +0000
+++ b/sys/dev/usb/uhci.c        Sun Sep 08 06:37:23 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uhci.c,v 1.258 2013/09/07 16:17:12 skrll Exp $ */
+/*     $NetBSD: uhci.c,v 1.259 2013/09/08 06:37:23 skrll Exp $ */
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.258 2013/09/07 16:17:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.259 2013/09/08 06:37:23 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1528,7 +1528,7 @@
        u_int32_t status = 0, nstatus;
        int actlen;
 
-       KASSERT(mutex_owned(&sc->sc_lock));
+       KASSERT(sc->sc_bus.use_polling || mutex_owned(&sc->sc_lock));
 
        DPRINTFN(12, ("uhci_idone: ii=%p\n", ii));
 #ifdef DIAGNOSTIC
@@ -1649,7 +1649,7 @@
 
  end:
        usb_transfer_complete(xfer);
-       KASSERT(mutex_owned(&sc->sc_lock));
+       KASSERT(sc->sc_bus.use_polling || mutex_owned(&sc->sc_lock));
        DPRINTFN(12, ("uhci_idone: ii=%p done\n", ii));
 }