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

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

diff -u --recursive --new-file v2.3.38/linux/drivers/char/tda8425.c linux/drivers/char/tda8425.c
@@ -104,7 +104,7 @@
 	tda8425_write(client, TDA8425_TR, tda->treble>>12|0xF0);
 }
 
-static void tda8425_init(struct i2c_client *client)
+static void do_tda8425_init(struct i2c_client *client)
 {
 	struct tda8425 *tda = client->data;
 
@@ -152,7 +152,7 @@
 	if (!tda)
 		return -ENOMEM;
 	memset(tda,0,sizeof *tda);
-	tda8425_init(client);
+	do_tda8425_init(client);
 	MOD_INC_USE_COUNT;
 	strcpy(client->name,"TDA8425");
 	printk(KERN_INFO "tda8425: init\n");
@@ -173,7 +173,7 @@
 {
 	struct tda8425 *tda  = client->data;
     
-	tda8425_init(client);
+	do_tda8425_init(client);
 	i2c_detach_client(client);
 
 	kfree(tda);

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