Module Name: src
Committed By: nat
Date: Mon Feb 27 10:31:02 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Audio passes the atf test again.
To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 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.312 src/sys/dev/audio.c:1.313
--- src/sys/dev/audio.c:1.312 Sun Feb 26 16:22:55 2017
+++ src/sys/dev/audio.c Mon Feb 27 10:31:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.312 2017/02/26 16:22:55 riastradh Exp $ */
+/* $NetBSD: audio.c,v 1.313 2017/02/27 10:31:02 nat Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.312 2017/02/26 16:22:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.313 2017/02/27 10:31:02 nat Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -3431,14 +3431,13 @@ audiostartp(struct audio_softc *sc, stru
vc->sc_pbus = true;
if (sc->sc_trigger_started == false) {
audio_mix(sc);
-
+ audio_mix(sc);
+ mutex_enter(sc->sc_intr_lock);
+ mix_write(sc);
vc = chan->vc;
vc->sc_mpr.s.outp =
audio_stream_add_outp(&vc->sc_mpr.s,
vc->sc_mpr.s.outp, vc->sc_mpr.blksize);
- audio_mix(sc);
- mutex_enter(sc->sc_intr_lock);
- mix_write(sc);
mix_write(sc);
cv_broadcast(&sc->sc_condvar);
mutex_exit(sc->sc_intr_lock);
