aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa711x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa711x.c')
-rw-r--r--drivers/media/video/saa711x.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 31f7b950b01c..8008537391b5 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -494,7 +494,6 @@ saa711x_detect_client (struct i2c_adapter *adapter,
494 client->addr = address; 494 client->addr = address;
495 client->adapter = adapter; 495 client->adapter = adapter;
496 client->driver = &i2c_driver_saa711x; 496 client->driver = &i2c_driver_saa711x;
497 client->flags = I2C_CLIENT_ALLOW_USE;
498 strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client))); 497 strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client)));
499 decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL); 498 decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL);
500 if (decoder == NULL) { 499 if (decoder == NULL) {
@@ -565,11 +564,11 @@ saa711x_detach_client (struct i2c_client *client)
565/* ----------------------------------------------------------------------- */ 564/* ----------------------------------------------------------------------- */
566 565
567static struct i2c_driver i2c_driver_saa711x = { 566static struct i2c_driver i2c_driver_saa711x = {
568 .owner = THIS_MODULE, 567 .driver = {
569 .name = "saa711x", 568 .name = "saa711x",
569 },
570 570
571 .id = I2C_DRIVERID_SAA711X, 571 .id = I2C_DRIVERID_SAA711X,
572 .flags = I2C_DF_NOTIFY,
573 572
574 .attach_adapter = saa711x_attach_adapter, 573 .attach_adapter = saa711x_attach_adapter,
575 .detach_client = saa711x_detach_client, 574 .detach_client = saa711x_detach_client,