Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev Correct copy/paste/modify issue in audio_suspend().



details:   https://anonhg.NetBSD.org/src/rev/6e55afa41dc9
branches:  trunk
changeset: 771562:6e55afa41dc9
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Nov 25 03:13:06 2011 +0000

description:
Correct copy/paste/modify issue in audio_suspend().

diffstat:

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

diffs (33 lines):

diff -r 76fcb21cf08c -r 6e55afa41dc9 sys/dev/audio.c
--- a/sys/dev/audio.c   Fri Nov 25 02:59:54 2011 +0000
+++ b/sys/dev/audio.c   Fri Nov 25 03:13:06 2011 +0000
@@ -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 @@
 
        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



Home | Main Index | Thread Index | Old Index