commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / drivers / media / video / tuner.c

diff --git a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c
index b7d8469..b1760ae 100644 (file)
--- a/drivers/media/video/tuner.c
+++ b/drivers/media/video/tuner.c
@@ -824,7 +824,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
        if (type < TUNERS) {
                t->type = type;
                printk("tuner(bttv): type forced to %d (%s) [insmod]\n",t->type,tuners[t->type].name);
-               strlcpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);
+               strlcpy(client->name, tuners[t->type].name, DEVICE_NAME_SIZE);
        }
         i2c_attach_client(client);
         if (t->type == TUNER_MT2032)
@@ -875,7 +875,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
                t->type = *iarg;
                printk("tuner: type set to %d (%s)\n",
                         t->type,tuners[t->type].name);
-               strlcpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);
+               strlcpy(client->name, tuners[t->type].name, DEVICE_NAME_SIZE);
                if (t->type == TUNER_MT2032)
                         mt2032_init(client);
                break;
@@ -962,9 +962,7 @@ static struct i2c_client client_template =
 {
        .flags  = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
-       .dev  = {
-               .name   = "(tuner unset)",
-       },
+       .name   = "(tuner unset)",
 };
 
 static int tuner_init_module(void)