Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb Move KASSERT down to the point where the endpoin...



details:   https://anonhg.NetBSD.org/src/rev/dfdcf23d7dfb
branches:  trunk
changeset: 771603:dfdcf23d7dfb
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Nov 26 03:19:42 2011 +0000

description:
Move KASSERT down to the point where the endpoint is known to exist.

diffstat:

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

diffs (31 lines):

diff -r ab7e561252d2 -r dfdcf23d7dfb sys/dev/usb/umidi.c
--- a/sys/dev/usb/umidi.c       Sat Nov 26 03:14:25 2011 +0000
+++ b/sys/dev/usb/umidi.c       Sat Nov 26 03:19:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: umidi.c,v 1.50 2011/11/26 03:14:25 joerg Exp $ */
+/*     $NetBSD: umidi.c,v 1.51 2011/11/26 03:19:42 joerg Exp $ */
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.50 2011/11/26 03:14:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.51 2011/11/26 03:19:42 joerg Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1148,11 +1148,11 @@
        u_int16_t mask;
        int err;
 
-       KASSERT(mutex_owned(&ep->sc->sc_lock));
 
        if (jack->opened) {
                ep = jack->endpoint;
                sc = ep->sc;
+               KASSERT(mutex_owned(&sc->sc_lock));
                mask = 1 << (jack->cable_number);
                while (mask & (ep->this_schedule | ep->next_schedule)) {
                        err = cv_timedwait_sig(&sc->sc_cv, &sc->sc_lock,



Home | Main Index | Thread Index | Old Index