patch-2.3.39 linux/drivers/char/tda9855.c

• Lines: 55
• Date: Sat Jan 8 12:54:54 2000
• Orig file: v2.3.38/linux/drivers/char/tda9855.c
• Orig date: Tue Jan 4 13:57:16 2000

diff -u --recursive --new-file v2.3.38/linux/drivers/char/tda9855.c linux/drivers/char/tda9855.c
@@ -194,7 +194,7 @@
 	return 0;
 }
 
-static void tda9855_init(struct i2c_client *client)
+static void do_tda9855_init(struct i2c_client *client)
 {
 	struct tda9855 *t = client->data;
 
@@ -235,7 +235,7 @@
 	if (!t)
 		return -ENOMEM;
 	memset(t,0,sizeof *t);
-	tda9855_init(client);
+	do_tda9855_init(client);
 	MOD_INC_USE_COUNT;
 	strcpy(client->name,"TDA9855");
 	printk(KERN_INFO "tda9855: init\n");
@@ -255,7 +255,7 @@
 {
 	struct tda9855 *t  = client->data;
 
-	tda9855_init(client);
+	do_tda9855_init(client);
 	i2c_detach_client(client);
 	
 	kfree(t);
@@ -298,8 +298,7 @@
 
 		va->mode = ((TDA9855_STP | TDA9855_SAPP) & 
 			    tda9855_read(client)) >> 4;
-		if (0 == va->mode)
-			va->mode = VIDEO_SOUND_MONO;
+		va->mode |= VIDEO_SOUND_MONO;
 		break;
 	}
 	case VIDIOCSAUDIO:
@@ -327,7 +326,7 @@
 		case VIDEO_SOUND_STEREO:
 			t->c2= TDA9855_STEREO | (t->c2 & 0x3f); 
 			break;
-		case VIDEO_SOUND_LANG2:
+		case VIDEO_SOUND_LANG1:
 			t->c2= TDA9855_SAP | (t->c2 & 0x3f); 
 			break;
 		}
@@ -445,7 +444,7 @@
 #ifdef MODULE
 void cleanup_module(void)
 {
-	i2c_add_driver(&driver);
+	i2c_del_driver(&driver);
 }
 #endif