Source-Changes-HG archive

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

[src/trunk]: src/sys/dev Ensure the vc block size is set before call to set d...



details:   https://anonhg.NetBSD.org/src/rev/622fad8d1ff9
branches:  trunk
changeset: 351207:622fad8d1ff9
user:      nat <nat%NetBSD.org@localhost>
date:      Tue Feb 07 02:05:26 2017 +0000

description:
Ensure the vc block size is set before call to set defaults.

It should address PR kern/51746 Panics from audio.

diffstat:

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

diffs (28 lines):

diff -r eeda22853d3d -r 622fad8d1ff9 sys/dev/audio.c
--- a/sys/dev/audio.c   Mon Feb 06 23:45:49 2017 +0000
+++ b/sys/dev/audio.c   Tue Feb 07 02:05:26 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: audio.c,v 1.300 2017/02/03 20:13:52 nat Exp $  */
+/*     $NetBSD: audio.c,v 1.301 2017/02/07 02:05:26 nat 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.300 2017/02/03 20:13:52 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.301 2017/02/07 02:05:26 nat Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -1963,6 +1963,9 @@
                mode |= AUMODE_PLAY | AUMODE_PLAY_ALL;
        }
 
+       vc->sc_mrr.blksize = sc->sc_vchan[0]->sc_mrr.blksize;
+       vc->sc_mpr.blksize = sc->sc_vchan[0]->sc_mpr.blksize;
+
        /*
         * Multiplex device: /dev/audio (MU-Law) and /dev/sound (linear)
         * The /dev/audio is always (re)set to 8-bit MU-Law mono



Home | Main Index | Thread Index | Old Index