V4L/DVB: ngene: Fix I2C initialisation

Use I2C_CLASS_TV_DIGITAL, not I2C_ADAP_CLASS_TV_DIGITAL.
Remove initialisation of bus_lock mutex.
Thanks to Mauro for pointing out.

Signed-off-by: Oliver Endriss <[email protected]>
Thanks-to: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 1b53482f6e7f9455d3fd52d61b36ff997676071b..ea610e4b571d22c7583203a877e822f2a4195719 100644 (file)
--- 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)
        struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
 
        i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       adap->class = I2C_ADAP_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
-#else
-       adap->class = I2C_CLASS_TV_ANALOG;
-#endif
+       adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
 
        strcpy(adap->name, "nGene");
 
@@ -859,7 +855,6 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr)
        adap->algo_data = (void *)&(dev->channel[dev_nr]);
        adap->dev.parent = &dev->pci_dev->dev;
 
-       mutex_init(&adap->bus_lock);
        return i2c_add_adapter(adap);
 }