Module Name: src
Committed By: martin
Date: Tue Jan 24 05:22:38 UTC 2017
Modified Files:
src/sys/dev/ebus: cs4231_ebus.c
Log Message:
cs4231_ebus_round_blocksize: never return 0 as blocksize
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ebus/cs4231_ebus.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/ebus/cs4231_ebus.c
diff -u src/sys/dev/ebus/cs4231_ebus.c:1.35 src/sys/dev/ebus/cs4231_ebus.c:1.36
--- src/sys/dev/ebus/cs4231_ebus.c:1.35 Wed Nov 23 23:07:31 2011
+++ src/sys/dev/ebus/cs4231_ebus.c Tue Jan 24 05:22:38 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_ebus.c,v 1.35 2011/11/23 23:07:31 jmcneill Exp $ */
+/* $NetBSD: cs4231_ebus.c,v 1.36 2017/01/24 05:22:38 martin Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.35 2011/11/23 23:07:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.36 2017/01/24 05:22:38 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sparc_arch.h"
@@ -268,9 +268,13 @@ static int
cs4231_ebus_round_blocksize(void *addr, int blk, int mode,
const audio_params_t *param)
{
+ int sz;
/* we want to use DMA burst size of 16 words */
- return blk & -64;
+ sz = blk & -64;
+ if (sz == 0)
+ sz = 64; /* zero is not a good blocksize */
+ return sz;
}
