patch(bttv-0.7.105) compile fix

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



Hi,
this cures this compile error:

  msp3400.c: In function `msp3400c_setstereo':
  msp3400.c:487: duplicate array index in initializer
  msp3400.c:487: (near initialization for `strmode')

-
Gunther


--- bttv-0.7.105/driver/msp3400.c-orig	Sun Feb 16 11:19:03 2003
+++ bttv-0.7.105/driver/msp3400.c	Sun Feb 16 11:21:02 2003
@@ -482,8 +482,7 @@
 /* turn on/off nicam + stereo */
 static void msp3400c_setstereo(struct i2c_client *client, int mode)
 {
-	static char *strmode[] = {
-		[ 0 ... 15 ]           = "invalid",
+	static char *strmode[15] = {
 		[ VIDEO_SOUND_MONO ]   = "mono",
 		[ VIDEO_SOUND_STEREO ] = "stereo",
 		[ VIDEO_SOUND_LANG1  ] = "lang1",
@@ -493,6 +492,11 @@
 	int nicam=0; /* channel source: FM/AM or nicam */
 	int src=0;
 
+	if(strmode[mode]==NULL) {
+		dprintk("msp3400 invalid mode %d\n",mode);
+		return;
+		}
+
 	/* switch demodulator */
 	switch (msp->mode) {
 	case MSP_MODE_FM_TERRA:

[Index of Archives]     [Linux DVB]     [Video Disk Recorder]     [Asterisk]     [Photo]     [DCCP]     [Netdev]     [Xorg]     [Util Linux NG]     [Xfree86]     [Free Photo Albums]     [Fedora Users]     [Fedora Women]     [ALSA Users]     [ALSA Devel]     [Linux USB]

Powered by Linux