Module Name: src Committed By: nat Date: Fri Feb 24 16:53:24 UTC 2017
Modified Files: src/sys/dev: audio.c Log Message: Remove use of sc_intr_lock from audio_read. Fixes LOCKDEBUG panics. To generate a diff of this commit: cvs rdiff -u -r1.310 -r1.311 src/sys/dev/audio.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/dev/audio.c diff -u src/sys/dev/audio.c:1.310 src/sys/dev/audio.c:1.311 --- src/sys/dev/audio.c:1.310 Fri Feb 24 09:49:49 2017 +++ src/sys/dev/audio.c Fri Feb 24 16:53:24 2017 @@ -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 <nathanialsl...@yahoo.com.au> @@ -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 @@ audio_read(struct audio_softc *sc, struc 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