vserver 2.0 rc7

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

diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index d1ecce3..cf0db25 100644 (file)
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -236,7 +236,8 @@ bt819_init (struct i2c_client *client)
        init[0x07 * 2 - 1] = timing->hactive & 0xff;
        init[0x08 * 2 - 1] = timing->hscale >> 8;
        init[0x09 * 2 - 1] = timing->hscale & 0xff;
-       init[0x19*2-1] = decoder->norm == 0 ? 115 : 93; /* Chroma burst delay */
+       /* 0x15 in array is address 0x19 */
+       init[0x15 * 2 - 1] = (decoder->norm == 0) ? 115 : 93;   /* Chroma burst delay */
        /* reset */
        bt819_write(client, 0x1f, 0x00);
        mdelay(1);
@@ -517,7 +518,6 @@ static struct i2c_client_address_data addr_data = {
        .force                  = force
 };
 
-static int bt819_i2c_id = 0;
 static struct i2c_driver i2c_driver_bt819;
 
 static int
@@ -546,7 +546,6 @@ bt819_detect_client (struct i2c_adapter *adapter,
        client->adapter = adapter;
        client->driver = &i2c_driver_bt819;
        client->flags = I2C_CLIENT_ALLOW_USE;
-       client->id = bt819_i2c_id++;
 
        decoder = kmalloc(sizeof(struct bt819), GFP_KERNEL);
        if (decoder == NULL) {
@@ -568,16 +567,13 @@ bt819_detect_client (struct i2c_adapter *adapter,
        id = bt819_read(client, 0x17);
        switch (id & 0xf0) {
        case 0x70:
-               snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
-                        "bt819a[%d]", client->id);
+               strlcpy(I2C_NAME(client), "bt819a", sizeof(I2C_NAME(client)));
                break;
        case 0x60:
-               snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
-                        "bt817a[%d]", client->id);
+               strlcpy(I2C_NAME(client), "bt817a", sizeof(I2C_NAME(client)));
                break;
        case 0x20:
-               snprintf(I2C_NAME(client), sizeof(I2C_NAME(client)) - 1,
-                        "bt815a[%d]", client->id);
+               strlcpy(I2C_NAME(client), "bt815a", sizeof(I2C_NAME(client)));
                break;
        default:
                dprintk(1,