Commit 6525e67c authored by Oliver Endriss's avatar Oliver Endriss Committed by Mauro Carvalho Chehab

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: default avatarOliver Endriss <o.endriss@gmx.de>
Thanks-to: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 684688d8
...@@ -847,11 +847,7 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr) ...@@ -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); struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
i2c_set_adapdata(adap, &(dev->channel[dev_nr])); i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
#ifdef I2C_ADAP_CLASS_TV_DIGITAL adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
adap->class = I2C_ADAP_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
#else
adap->class = I2C_CLASS_TV_ANALOG;
#endif
strcpy(adap->name, "nGene"); strcpy(adap->name, "nGene");
...@@ -859,7 +855,6 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr) ...@@ -859,7 +855,6 @@ static int ngene_i2c_init(struct ngene *dev, int dev_nr)
adap->algo_data = (void *)&(dev->channel[dev_nr]); adap->algo_data = (void *)&(dev->channel[dev_nr]);
adap->dev.parent = &dev->pci_dev->dev; adap->dev.parent = &dev->pci_dev->dev;
mutex_init(&adap->bus_lock);
return i2c_add_adapter(adap); return i2c_add_adapter(adap);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment