summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorskrll <skrll@NetBSD.org>2013-09-08 06:37:23 +0000
committerskrll <skrll@NetBSD.org>2013-09-08 06:37:23 +0000
commitdb5f556499ec06f13e53c1164bc460dfd127e651 (patch)
tree1bb1843cd7ee9a443b8ee8f930d6c8cff8f6ecc3 /sys/dev
parent60ac91641005feac32113ae260d3b81d1dea8b44 (diff)
Add sc->sc_bus.use_polling || to a couple of KASSERTs
PR/46826
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uhci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index d904adb748a..5fd8a473056 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -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 @@ uhci_idone(uhci_intr_info_t *ii)
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 @@ uhci_idone(uhci_intr_info_t *ii)
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));
}