vserver 2.0 rc7

[linux-2.6.git] / drivers / media / video / adv7170.c

diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index 643bea0..80254ca 100644 (file)
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -402,7 +402,6 @@ static struct i2c_client_address_data addr_data = {
        .force                  = force
 };
 
-static int adv7170_i2c_id = 0;
 static struct i2c_driver i2c_driver_adv7170;
 
 static int
@@ -432,7 +431,6 @@ adv7170_detect_client (struct i2c_adapter *adapter,
        client->adapter = adapter;
        client->driver = &i2c_driver_adv7170;
        client->flags = I2C_CLIENT_ALLOW_USE;
-       client->id = adv7170_i2c_id++;
        if ((client->addr == I2C_ADV7170 >> 1) ||
            (client->addr == (I2C_ADV7170 >> 1) + 1)) {
                dname = adv7170_name;
@@ -444,8 +442,7 @@ adv7170_detect_client (struct i2c_adapter *adapter,
                kfree(client);
                return 0;
        }
-       snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
-               "%s[%d]", dname, client->id);
+       strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
 
        encoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL);
        if (encoder == NULL) {