[src/bouyer-socketcan]: src/sys/dev SYnc with HEAD

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a04988f0f0f6
branches:  bouyer-socketcan
changeset: 820904:a04988f0f0f6
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Apr 26 10:10:04 2017 +0000

description:
SYnc with HEAD

diffstat:

 sys/dev/audio.c |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r c06876ff242e -r a04988f0f0f6 sys/dev/audio.c
--- a/sys/dev/audio.c   Mon Apr 24 13:38:33 2017 +0000
+++ b/sys/dev/audio.c   Wed Apr 26 10:10:04 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.291.2.1 2017/04/21 16:53:44 bouyer Exp $   */
+/*     $NetBSD: audio.c,v 1.291.2.2 2017/04/26 10:10:04 bouyer Exp $   */
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -148,7 +148,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.291.2.1 2017/04/21 16:53:44 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.291.2.2 2017/04/26 10:10:04 bouyer Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -3598,12 +3598,17 @@
                cv_broadcast(&sc->sc_wchan);
        }
 
-       if (audio_stream_get_used(&sc->sc_pr.s) < blksize)
-               goto wake_mix;
-
        vc->sc_mpr.s.outp = audio_stream_add_outp(&vc->sc_mpr.s,
            vc->sc_mpr.s.outp, blksize);
 
+       if (audio_stream_get_used(&sc->sc_pr.s) < blksize) {
+               audio_fill_silence(&vc->sc_pparams, vc->sc_mpr.s.inp,
+                   vc->sc_mpr.blksize);
+               vc->sc_mpr.s.inp = audio_stream_add_inp(&vc->sc_mpr.s,
+                   vc->sc_mpr.s.inp, blksize);
+               goto wake_mix;
+       }
+
        mix_write(sc);
 
 wake_mix: