[src/netbsd-9]: src/sys/dev/audio Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/424b99502aea
branches:  netbsd-9
changeset: 963075:424b99502aea
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Oct 06 10:58:14 2019 +0000

description:
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:

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

diffs (28 lines):

diff -r 1368067f8dc4 -r 424b99502aea sys/dev/audio/audio.c
--- a/sys/dev/audio/audio.c     Fri Oct 04 08:09:49 2019 +0000
+++ b/sys/dev/audio/audio.c     Sun Oct 06 10:58:14 2019 +0000
@@ -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 @@
                } 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;