Module Name: src
Committed By: nat
Date: Tue Feb 7 02:05:27 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Ensure the vc block size is set before call to set defaults.
It should address PR kern/51746 Panics from audio.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 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.300 src/sys/dev/audio.c:1.301
--- src/sys/dev/audio.c:1.300 Fri Feb 3 20:13:52 2017
+++ src/sys/dev/audio.c Tue Feb 7 02:05:26 2017
@@ -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 <[email protected]>
@@ -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 @@ audio_open(dev_t dev, struct audio_softc
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
