Module Name: src
Committed By: mrg
Date: Mon Apr 30 02:42:32 UTC 2012
Modified Files:
src/sys/dev [jmcneill-usbmp]: audio.c
Log Message:
pullup audio.c 1.261: audio_clear() locking fixes
To generate a diff of this commit:
cvs rdiff -u -r1.255.2.4 -r1.255.2.5 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.255.2.4 src/sys/dev/audio.c:1.255.2.5
--- src/sys/dev/audio.c:1.255.2.4 Sun Apr 29 23:04:47 2012
+++ src/sys/dev/audio.c Mon Apr 30 02:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.255.2.4 2012/04/29 23:04:47 mrg Exp $ */
+/* $NetBSD: audio.c,v 1.255.2.5 2012/04/30 02:42:32 mrg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.255.2.4 2012/04/29 23:04:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.255.2.5 2012/04/30 02:42:32 mrg Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -1991,7 +1991,7 @@ void
audio_clear(struct audio_softc *sc)
{
- KASSERT(mutex_owned(sc->sc_lock));
+ KASSERT(mutex_owned(sc->sc_intr_lock));
if (sc->sc_rbus) {
cv_broadcast(&sc->sc_rchan);
@@ -2387,8 +2387,8 @@ audio_ioctl(struct audio_softc *sc, u_lo
DPRINTF(("AUDIO_FLUSH\n"));
rbus = sc->sc_rbus;
pbus = sc->sc_pbus;
- audio_clear(sc);
mutex_enter(sc->sc_intr_lock);
+ audio_clear(sc);
error = audio_initbufs(sc);
if (error) {
mutex_exit(sc->sc_intr_lock);
