--- ivtv-0.3.3a/driver/saa7127.c	2005-04-04 12:05:31.000000000 -0700
+++ ivtv-0.3.2q/driver/saa7127.c	2005-03-31 07:44:15.000000000 -0800
@@ -735,7 +735,9 @@
 	client->adapter = adapter;
 	client->driver = &i2c_driver_saa7127;
 	client->flags = I2C_CLIENT_ALLOW_USE;
-	snprintf(client->name, sizeof(client->name) - 1, "saa7127[%d]", sizeof(I2C_NAME(client)));
+	client->id = saa7127_i2c_id++;
+	snprintf(client->name, sizeof(client->name) - 1, "saa7127[%d]",
+		 client->id);
 
 	encoder = kmalloc(sizeof(struct saa7127), GFP_KERNEL);