From 3f1dc2b013259dc11bc146e17cfdd68c6d7a9f1c Mon Sep 17 00:00:00 2001
From: bjh21 <bjh21@NetBSD.org>
Date: Sat, 6 Dec 2003 19:59:32 +0000
Subject: [PATCH] Don't complain if we're asked for != 8 channels.  There's no
 actual support for fewer channels yet, but this is necessary just to avoid a
 boot-time panic.

---
 sys/arch/arm/iomd/vidcaudio.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/arch/arm/iomd/vidcaudio.c b/sys/arch/arm/iomd/vidcaudio.c
index a1ea59edd83d..63b5a94c9e50 100644
--- a/sys/arch/arm/iomd/vidcaudio.c
+++ b/sys/arch/arm/iomd/vidcaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.15 2003/10/26 11:45:46 jdolecek Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.16 2003/12/06 19:59:32 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -38,7 +38,7 @@
 
 #include <sys/param.h>	/* proc.h */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.15 2003/10/26 11:45:46 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.16 2003/12/06 19:59:32 bjh21 Exp $");
 
 #include <sys/conf.h>   /* autoconfig functions */
 #include <sys/device.h> /* device calls */
@@ -330,9 +330,9 @@ vidcaudio_set_params(addr, setmode, usemode, p, r)
 	int setmode, usemode;
 	struct audio_params *p, *r;
 {
-	if (p->encoding != AUDIO_ENCODING_ULAW ||
-	    p->channels != 8)
+	if (p->encoding != AUDIO_ENCODING_ULAW)
 		return EINVAL;
+	/* FIXME Handle number of channels properly. */
 	vidcaudio_rate(4 * p->sample_rate / (3 * 1024)); /* XXX probably wrong */
 
 	return 0;