aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/ngene/ngene-i2c.c2
-rw-r--r--drivers/media/video/hdpvr/hdpvr-i2c.c1
-rw-r--r--drivers/media/video/hexium_gemini.c1
-rw-r--r--drivers/media/video/hexium_orion.c1
4 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/dvb/ngene/ngene-i2c.c
index 477fe0aade86..38074e9cbb6d 100644
--- a/drivers/media/dvb/ngene/ngene-i2c.c
+++ b/drivers/media/dvb/ngene/ngene-i2c.c
@@ -165,7 +165,7 @@ int ngene_i2c_init(struct ngene *dev, int dev_nr)
165 struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); 165 struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
166 166
167 i2c_set_adapdata(adap, &(dev->channel[dev_nr])); 167 i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
168 adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG; 168 adap->class = I2C_CLASS_TV_DIGITAL;
169 169
170 strcpy(adap->name, "nGene"); 170 strcpy(adap->name, "nGene");
171 171
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index 463b81bef6e2..409de11096d4 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -127,7 +127,6 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
127 strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C", 127 strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
128 sizeof(i2c_adap->name)); 128 sizeof(i2c_adap->name));
129 i2c_adap->algo = &hdpvr_algo; 129 i2c_adap->algo = &hdpvr_algo;
130 i2c_adap->class = I2C_CLASS_TV_ANALOG;
131 i2c_adap->owner = THIS_MODULE; 130 i2c_adap->owner = THIS_MODULE;
132 i2c_adap->dev.parent = &dev->udev->dev; 131 i2c_adap->dev.parent = &dev->udev->dev;
133 132
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index ad2c232baa6d..7ae96367b3ab 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -367,7 +367,6 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
367 saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 367 saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
368 368
369 hexium->i2c_adapter = (struct i2c_adapter) { 369 hexium->i2c_adapter = (struct i2c_adapter) {
370 .class = I2C_CLASS_TV_ANALOG,
371 .name = "hexium gemini", 370 .name = "hexium gemini",
372 }; 371 };
373 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); 372 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 938a1f8f880a..b72d0f0b8310 100644
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -230,7 +230,6 @@ static int hexium_probe(struct saa7146_dev *dev)
230 saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); 230 saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
231 231
232 hexium->i2c_adapter = (struct i2c_adapter) { 232 hexium->i2c_adapter = (struct i2c_adapter) {
233 .class = I2C_CLASS_TV_ANALOG,
234 .name = "hexium orion", 233 .name = "hexium orion",
235 }; 234 };
236 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); 235 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);