diff options
| author | martin <martin@NetBSD.org> | 2019-10-06 10:58:14 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2019-10-06 10:58:14 +0000 |
| commit | 79ea7b567ffb1d73348ef8fb114ec6bc0f625c8e (patch) | |
| tree | 9eb4508854d9a2968e91ac76dcf1bb2710684300 /sys | |
| parent | a20f9fa590c0cc5fd599d614c7abb9abfcb9db65 (diff) | |
Pull up following revision(s) (requested by isaki in ticket #284):
sys/dev/audio/audio.c: revision 1.29
Add missing mutex, we were hitting a KASSERT.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/audio/audio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/audio/audio.c b/sys/dev/audio/audio.c index 9fa01171f2b..8eeb09d3821 100644 --- a/sys/dev/audio/audio.c +++ b/sys/dev/audio/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.28 2019/07/10 13:26:47 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.28.2.1 2019/10/06 10:58:14 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 2019/07/10 13:26:47 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.28.2.1 2019/10/06 10:58:14 martin Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -7726,7 +7726,9 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, void *addr, int flag, } else { ma = NULL; } + 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; |
