Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb Fix a KASSERT (ub_usepolling || mutex)



details:   https://anonhg.NetBSD.org/src/rev/3d26f99f6515
branches:  trunk
changeset: 345081:3d26f99f6515
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri May 06 16:30:01 2016 +0000

description:
Fix a KASSERT (ub_usepolling || mutex)

diffstat:

 sys/dev/usb/ehci.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 401c0216ff76 -r 3d26f99f6515 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Fri May 06 13:03:06 2016 +0000
+++ b/sys/dev/usb/ehci.c        Fri May 06 16:30:01 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.250 2016/05/06 13:03:06 skrll Exp $ */
+/*     $NetBSD: ehci.c,v 1.251 2016/05/06 16:30:01 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.250 2016/05/06 13:03:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.251 2016/05/06 16:30:01 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -3905,7 +3905,7 @@
 
        DPRINTF("xfer=%p, actlen=%d", xfer, xfer->ux_actlen, 0, 0);
 
-       KASSERT(mutex_owned(&sc->sc_lock));
+       KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 
        usb_syncmem(&xfer->ux_dmabuf, 0, xfer->ux_length,
            rd ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);



Home | Main Index | Thread Index | Old Index