diff options
Diffstat (limited to 'drivers/media/video/tvp5150.c')
-rw-r--r-- | drivers/media/video/tvp5150.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 81e6d4494e7d..a60442ea4f94 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); | |||
31 | #define dprintk(num, format, args...) \ | 31 | #define dprintk(num, format, args...) \ |
32 | do { \ | 32 | do { \ |
33 | if (debug >= num) \ | 33 | if (debug >= num) \ |
34 | printk(format , ##args); \ | 34 | printk(format, ##args); \ |
35 | } while (0) | 35 | } while (0) |
36 | 36 | ||
37 | /* supported controls */ | 37 | /* supported controls */ |
@@ -714,7 +714,6 @@ static struct i2c_driver driver; | |||
714 | 714 | ||
715 | static struct i2c_client client_template = { | 715 | static struct i2c_client client_template = { |
716 | .name = "(unset)", | 716 | .name = "(unset)", |
717 | .flags = I2C_CLIENT_ALLOW_USE, | ||
718 | .driver = &driver, | 717 | .driver = &driver, |
719 | }; | 718 | }; |
720 | 719 | ||
@@ -770,7 +769,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter, | |||
770 | 769 | ||
771 | if (debug > 1) | 770 | if (debug > 1) |
772 | dump_reg(client); | 771 | dump_reg(client); |
773 | |||
774 | return 0; | 772 | return 0; |
775 | } | 773 | } |
776 | 774 | ||
@@ -802,12 +800,12 @@ static int tvp5150_detach_client(struct i2c_client *client) | |||
802 | /* ----------------------------------------------------------------------- */ | 800 | /* ----------------------------------------------------------------------- */ |
803 | 801 | ||
804 | static struct i2c_driver driver = { | 802 | static struct i2c_driver driver = { |
805 | .owner = THIS_MODULE, | 803 | .driver = { |
806 | .name = "tvp5150", | 804 | .name = "tvp5150", |
805 | }, | ||
807 | 806 | ||
808 | /* FIXME */ | 807 | /* FIXME */ |
809 | .id = I2C_DRIVERID_SAA7110, | 808 | .id = I2C_DRIVERID_SAA7110, |
810 | .flags = I2C_DF_NOTIFY, | ||
811 | 809 | ||
812 | .attach_adapter = tvp5150_attach_adapter, | 810 | .attach_adapter = tvp5150_attach_adapter, |
813 | .detach_client = tvp5150_detach_client, | 811 | .detach_client = tvp5150_detach_client, |