aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 1b53482f6e7f..ea610e4b571d 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -847,11 +847,7 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr)
847 struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); 847 struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
848 848
849 i2c_set_adapdata(adap, &(dev->channel[dev_nr])); 849 i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
850#ifdef I2C_ADAP_CLASS_TV_DIGITAL 850 adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
851 adap->class = I2C_ADAP_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
852#else
853 adap->class = I2C_CLASS_TV_ANALOG;
854#endif
855 851
856 strcpy(adap->name, "nGene"); 852 strcpy(adap->name, "nGene");
857 853
@@ -859,7 +855,6 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr)
859 adap->algo_data = (void *)&(dev->channel[dev_nr]); 855 adap->algo_data = (void *)&(dev->channel[dev_nr]);
860 adap->dev.parent = &dev->pci_dev->dev; 856 adap->dev.parent = &dev->pci_dev->dev;
861 857
862 mutex_init(&adap->bus_lock);
863 return i2c_add_adapter(adap); 858 return i2c_add_adapter(adap);
864} 859}
865 860