Module Name: src
Committed By: mrg
Date: Sun Aug 11 22:55:03 UTC 2019
Modified Files:
src/sys/dev/usb: ohci.c
Log Message:
relax an assert to be mutex_owned || polling.
half of the patch i sent for netbsd-8 in PR#54331.
the other half is already applied.
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 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.289 src/sys/dev/usb/ohci.c:1.290
--- src/sys/dev/usb/ohci.c:1.289 Fri Mar 22 07:25:15 2019
+++ src/sys/dev/usb/ohci.c Sun Aug 11 22:55:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.289 2019/03/22 07:25:15 mrg Exp $ */
+/* $NetBSD: ohci.c,v 1.290 2019/08/11 22:55:03 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.289 2019/03/22 07:25:15 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.290 2019/08/11 22:55:03 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1673,7 +1673,7 @@ ohci_device_bulk_done(struct usbd_xfer *
int isread =
(UE_GET_DIR(xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress) == UE_DIR_IN);
- KASSERT(mutex_owned(&sc->sc_lock));
+ KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
OHCIHIST_FUNC(); OHCIHIST_CALLED();
DPRINTFN(10, "xfer=%#jx, actlen=%jd", (uintptr_t)xfer, xfer->ux_actlen,
