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

Next file: linux/drivers/i2o/i2o_block.c
Previous file: linux/drivers/char/tda9855.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.38/linux/drivers/char/tea6300.c linux/drivers/char/tea6300.c
@@ -111,7 +111,7 @@
 	tea6300_write(client, TEA6300_TR, tea->treble>>12);
 }
 
-static void tea6300_init(struct i2c_client *client)
+static void do_tea6300_init(struct i2c_client *client)
 {
 	struct tea6300 *tea = client->data;
 	
@@ -173,7 +173,7 @@
 	if (!tea)
 		return -ENOMEM;
 	memset(tea,0,sizeof *tea);
-	tea6300_init(client);
+	do_tea6300_init(client);
 
 	MOD_INC_USE_COUNT;
 	strcpy(client->name,"TEA6300T");
@@ -194,7 +194,7 @@
 {
 	struct tea6300 *tea  = client->data;
     
-	tea6300_init(client);
+	do_tea6300_init(client);
 	i2c_detach_client(client);
 
 	kfree(tea);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)