[src/netbsd-6]: src/sys/dev Pull up following revision(s) (requested by mrg i...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/00b552c540f7
branches:  netbsd-6
changeset: 774216:00b552c540f7
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Jun 13 19:14:17 2012 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #331):
        sys/dev/audio.c: revision 1.261
ensure that the intr lock is held for all audio_clear() callers.

diffstat:

 sys/dev/audio.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 52ee92df7e55 -r 00b552c540f7 sys/dev/audio.c
--- a/sys/dev/audio.c   Wed Jun 13 19:12:23 2012 +0000
+++ b/sys/dev/audio.c   Wed Jun 13 19:14:17 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.257.2.3 2012/05/07 03:03:18 riz Exp $      */
+/*     $NetBSD: audio.c,v 1.257.2.4 2012/06/13 19:14:17 riz Exp $      */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.257.2.3 2012/05/07 03:03:18 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.257.2.4 2012/06/13 19:14:17 riz Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1991,7 +1991,7 @@
 audio_clear(struct audio_softc *sc)
 {
 
-       KASSERT(mutex_owned(sc->sc_lock));
+       KASSERT(mutex_owned(sc->sc_intr_lock));
 
        if (sc->sc_rbus) {
                cv_broadcast(&sc->sc_rchan);
@@ -2387,8 +2387,8 @@
                DPRINTF(("AUDIO_FLUSH\n"));
                rbus = sc->sc_rbus;
                pbus = sc->sc_pbus;
+               mutex_enter(sc->sc_intr_lock);
                audio_clear(sc);
-               mutex_enter(sc->sc_intr_lock);
                error = audio_initbufs(sc);
                if (error) {
                        mutex_exit(sc->sc_intr_lock);