Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ensure that the intr lock is held for all audio_clear() callers.

This commit is contained in:
mrg 2012-04-30 02:16:46 +00:00
parent 75e68013dd
commit 1ed31fd325
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/audio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: audio.c,v 1.260 2012/04/06 06:15:13 mrg Exp $ */
/* $NetBSD: audio.c,v 1.261 2012/04/30 02:16:46 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.260 2012/04/06 06:15:13 mrg Exp $");
__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.261 2012/04/30 02:16:46 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_long cmd, void *addr, int flag,
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);