vserver 2.0 rc7

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

diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index d7e45f8..72c7eb0 100644 (file)
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -306,7 +306,6 @@ static struct i2c_client_address_data addr_data = {
        .force                  = force
 };
 
-static int bt856_i2c_id = 0;
 static struct i2c_driver i2c_driver_bt856;
 
 static int
@@ -335,9 +334,7 @@ bt856_detect_client (struct i2c_adapter *adapter,
        client->adapter = adapter;
        client->driver = &i2c_driver_bt856;
        client->flags = I2C_CLIENT_ALLOW_USE;
-       client->id = bt856_i2c_id++;
-       snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
-               "bt856[%d]", client->id);
+       strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
 
        encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
        if (encoder == NULL) {