[src/jmcneill-audiomp3]: src/sys/arch/sparc/dev use the sc_intr_lock when cal...

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

details:   https://anonhg.NetBSD.org/src/rev/3abb4d253b0d
branches:  jmcneill-audiomp3
changeset: 771342:3abb4d253b0d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Nov 20 12:04:42 2011 +0000

description:
use the sc_intr_lock when calling the rint/tint functions.

diffstat:

 sys/arch/sparc/dev/audioamd.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 8c2e20058592 -r 3abb4d253b0d sys/arch/sparc/dev/audioamd.c
--- a/sys/arch/sparc/dev/audioamd.c     Sun Nov 20 12:04:14 2011 +0000
+++ b/sys/arch/sparc/dev/audioamd.c     Sun Nov 20 12:04:42 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audioamd.c,v 1.26.4.1 2011/11/20 10:56:18 mrg Exp $    */
+/*     $NetBSD: audioamd.c,v 1.26.4.2 2011/11/20 12:04:42 mrg Exp $    */
 /*     NetBSD: am7930_sparc.c,v 1.44 1999/03/14 22:29:00 jonathan Exp  */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.26.4.1 2011/11/20 10:56:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.26.4.2 2011/11/20 12:04:42 mrg Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -477,16 +477,16 @@
        DPRINTFN(1, ("audiointr: sc=%p\n", sc););
 
        au = &sc->sc_au;
-       mutex_spin_enter(&sc->sc_lock);
+
+       mutex_spin_enter(&sc->sc_am7930.sc_lock);
        if (au->au_rdata > au->au_rend && sc->sc_rintr != NULL) {
-               mutex_spin_exit(&sc->sc_lock);
                (*sc->sc_rintr)(sc->sc_rarg);
-               mutex_spin_enter(&sc->sc_lock);
        }
        pint = (au->au_pdata > au->au_pend && sc->sc_pintr != NULL);
-       mutex_spin_exit(&sc->sc_lock);
        if (pint)
                (*sc->sc_pintr)(sc->sc_parg);
+
+       mutex_spin_exit(&sc->sc_am7930.sc_lock);
 }