aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7111.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7111.c')
-rw-r--r--drivers/media/video/saa7111.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index fe8a5e453969..acaeee592b54 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -518,7 +518,6 @@ saa7111_detect_client (struct i2c_adapter *adapter,
518 client->addr = address; 518 client->addr = address;
519 client->adapter = adapter; 519 client->adapter = adapter;
520 client->driver = &i2c_driver_saa7111; 520 client->driver = &i2c_driver_saa7111;
521 client->flags = I2C_CLIENT_ALLOW_USE;
522 strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client))); 521 strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client)));
523 522
524 decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL); 523 decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL);
@@ -590,11 +589,11 @@ saa7111_detach_client (struct i2c_client *client)
590/* ----------------------------------------------------------------------- */ 589/* ----------------------------------------------------------------------- */
591 590
592static struct i2c_driver i2c_driver_saa7111 = { 591static struct i2c_driver i2c_driver_saa7111 = {
593 .owner = THIS_MODULE, 592 .driver = {
594 .name = "saa7111", 593 .name = "saa7111",
594 },
595 595
596 .id = I2C_DRIVERID_SAA7111A, 596 .id = I2C_DRIVERID_SAA7111A,
597 .flags = I2C_DF_NOTIFY,
598 597
599 .attach_adapter = saa7111_attach_adapter, 598 .attach_adapter = saa7111_attach_adapter,
600 .detach_client = saa7111_detach_client, 599 .detach_client = saa7111_detach_client,