Module Name: src
Committed By: martin
Date: Wed Mar 31 13:45:54 UTC 2021
Modified Files:
src/sys/arch/sparc/dev [netbsd-9]: audioamd.c
Log Message:
Apply patch, requested by tsutsui in ticket #1239:
sys/arch/sparc/dev/audioamd.c (apply patch)
Fix for PR 56078 (different solution applied to -current): fix wrong
lock usage.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/arch/sparc/dev/audioamd.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/arch/sparc/dev/audioamd.c
diff -u src/sys/arch/sparc/dev/audioamd.c:1.29 src/sys/arch/sparc/dev/audioamd.c:1.29.2.1
--- src/sys/arch/sparc/dev/audioamd.c:1.29 Wed May 8 13:40:16 2019
+++ src/sys/arch/sparc/dev/audioamd.c Wed Mar 31 13:45:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: audioamd.c,v 1.29 2019/05/08 13:40:16 isaki Exp $ */
+/* $NetBSD: audioamd.c,v 1.29.2.1 2021/03/31 13:45:54 martin 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.29 2019/05/08 13:40:16 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audioamd.c,v 1.29.2.1 2021/03/31 13:45:54 martin Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -461,7 +461,7 @@ am7930swintr(void *sc0)
au = &sc->sc_au;
- mutex_spin_enter(&sc->sc_am7930.sc_lock);
+ mutex_spin_enter(&sc->sc_am7930.sc_intr_lock);
if (au->au_rdata > au->au_rend && sc->sc_rintr != NULL) {
(*sc->sc_rintr)(sc->sc_rarg);
}
@@ -469,7 +469,7 @@ am7930swintr(void *sc0)
if (pint)
(*sc->sc_pintr)(sc->sc_parg);
- mutex_spin_exit(&sc->sc_am7930.sc_lock);
+ mutex_spin_exit(&sc->sc_am7930.sc_intr_lock);
}
