summaryrefslogtreecommitdiff
path: root/sys/dev/audio
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-01-21 11:17:58 +0000
committermartin <martin@NetBSD.org>2020-01-21 11:17:58 +0000
commit03b3cb741d7bb0e7dba07385c9afca8876fd8635 (patch)
tree794ee6b495ba9edf3404c656e8f7c9f3a57acb1f /sys/dev/audio
parent1799bedfbe821f5510a614c370e85d5c5ce4edd8 (diff)
Pull up following revision(s) (requested by isaki in ticket #619):
sys/dev/audio/audio.c: revision 1.37 Move mutex_exit() correct place to protect sc_async_mixer. Thanks maxv@!
Diffstat (limited to 'sys/dev/audio')
-rw-r--r--sys/dev/audio/audio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c
index 3f0cf2f8d57..451b86d8629 100644
--- a/sys/dev/audio/audio.c
+++ b/sys/dev/audio/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.28.2.5 2020/01/02 09:18:15 martin Exp $ */
+/* $NetBSD: audio.c,v 1.28.2.6 2020/01/21 11:17:58 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.5 2020/01/02 09:18:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.6 2020/01/21 11:17:58 martin Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -7694,12 +7694,12 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, void *addr, int flag,
}
mutex_enter(sc->sc_lock);
mixer_remove(sc); /* remove old entry */
- mutex_exit(sc->sc_lock);
if (ma != NULL) {
ma->next = sc->sc_async_mixer;
ma->pid = curproc->p_pid;
sc->sc_async_mixer = ma;
}
+ mutex_exit(sc->sc_lock);
error = 0;
break;