Module Name: src
Committed By: jakllsch
Date: Fri Nov 25 03:13:06 UTC 2011
Modified Files:
src/sys/dev: audio.c
Log Message:
Correct copy/paste/modify issue in audio_suspend().
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 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.254 src/sys/dev/audio.c:1.255
--- src/sys/dev/audio.c:1.254 Wed Nov 23 23:07:31 2011
+++ src/sys/dev/audio.c Fri Nov 25 03:13:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.254 2011/11/23 23:07:31 jmcneill Exp $ */
+/* $NetBSD: audio.c,v 1.255 2011/11/25 03:13:06 jakllsch Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.254 2011/11/23 23:07:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.255 2011/11/25 03:13:06 jakllsch Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -4322,12 +4322,12 @@ audio_suspend(device_t dv, const pmf_qua
mutex_enter(sc->sc_lock);
audio_mixer_capture(sc);
- mutex_enter(sc->sc_lock);
+ mutex_enter(sc->sc_intr_lock);
if (sc->sc_pbus == true)
hwp->halt_output(sc->hw_hdl);
if (sc->sc_rbus == true)
hwp->halt_input(sc->hw_hdl);
- mutex_exit(sc->sc_lock);
+ mutex_exit(sc->sc_intr_lock);
#ifdef AUDIO_PM_IDLE
callout_halt(&sc->sc_idle_counter, sc->sc_lock);
#endif
