[src/trunk]: src/sys/dev Remove use of sc_intr_lock from audio_read. Fixes L...

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

details:   https://anonhg.NetBSD.org/src/rev/4155e94e0b04
branches:  trunk
changeset: 351744:4155e94e0b04
user:      nat <nat%NetBSD.org@localhost>
date:      Fri Feb 24 16:53:24 2017 +0000

description:
Remove use of sc_intr_lock from audio_read.  Fixes LOCKDEBUG panics.

diffstat:

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

diffs (30 lines):

diff -r f68e85aff275 -r 4155e94e0b04 sys/dev/audio.c
--- a/sys/dev/audio.c   Fri Feb 24 13:42:18 2017 +0000
+++ b/sys/dev/audio.c   Fri Feb 24 16:53:24 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.310 2017/02/24 09:49:49 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.311 2017/02/24 16:53:24 nat Exp $  */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.310 2017/02/24 09:49:49 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.311 2017/02/24 16:53:24 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -2546,11 +2546,9 @@
                DPRINTFN(1,("audio_read: outp=%p, cc=%d\n", outp, cc));
 
                n = uio->uio_resid;
-               mutex_exit(sc->sc_intr_lock);
                mutex_exit(sc->sc_lock);
                error = uiomove(__UNCONST(outp), cc, uio);
                mutex_enter(sc->sc_lock);
-               mutex_enter(sc->sc_intr_lock);
                n -= uio->uio_resid; /* number of bytes actually moved */
 
                vc->sc_rustream->outp = audio_stream_add_outp