summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/av7110
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/av7110')
-rw-r--r--linux/drivers/media/dvb/av7110/Kconfig1
-rw-r--r--linux/drivers/media/dvb/av7110/av7110.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/av7110/Kconfig b/linux/drivers/media/dvb/av7110/Kconfig
index 6b7e6961d..93270f079 100644
--- a/linux/drivers/media/dvb/av7110/Kconfig
+++ b/linux/drivers/media/dvb/av7110/Kconfig
@@ -23,4 +23,3 @@ config DVB_AV7110_OSD
its menus, so say Y if you want to use this software.
All other people say N.
-
diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index e9126e36c..6fcc7fec7 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -4364,6 +4364,9 @@ int av7110_attach (struct saa7146_dev* dev)
dvb_register_adapter(&adap, av7110->card_type->name);
av7110->dvb_adapter = adap;
+ /* fixme: speed ok? */
+ saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_480);
+
av7110->i2c_bus = dvb_register_i2c_bus (master_xfer, dev, av7110->dvb_adapter, 0);
if (!av7110->i2c_bus) {
dvb_unregister_adapter (av7110->dvb_adapter);
@@ -4640,7 +4643,6 @@ struct saa7146_extension av7110_extension = {
.num_stds = sizeof(standard)/sizeof(struct saa7146_standard),
.std_callback = NULL,
- .use_kernel_i2c = 0,
.vbi = NULL,
.ioctls = &ioctls[0],