Module Name: src
Committed By: mrg
Date: Fri Mar 22 07:25:15 UTC 2019
Modified Files:
src/sys/dev/usb: ohci.c
Log Message:
adjust KASSERT() for sc_lock to handle polling case.
should fix usb kdb in ddb. reported by martin.
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/sys/dev/usb/ohci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.288 src/sys/dev/usb/ohci.c:1.289
--- src/sys/dev/usb/ohci.c:1.288 Sun Feb 17 04:17:52 2019
+++ src/sys/dev/usb/ohci.c Fri Mar 22 07:25:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.288 2019/02/17 04:17:52 rin Exp $ */
+/* $NetBSD: ohci.c,v 1.289 2019/03/22 07:25:15 mrg Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.288 2019/02/17 04:17:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289 2019/03/22 07:25:15 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -585,7 +585,7 @@ ohci_reset_std_chain(ohci_softc_t *sc, s
OHCIHIST_FUNC(); OHCIHIST_CALLED();
DPRINTF("start len=%jd", alen, 0, 0, 0);
- KASSERT(mutex_owned(&sc->sc_lock));
+ KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
DPRINTFN(8, "addr=%jd endpt=%jd len=%jd speed=%jd",
xfer->ux_pipe->up_dev->ud_addr,
