diff options
author | Oliver Endriss <o.endriss@gmx.de> | 2010-02-03 20:06:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:55 -0500 |
commit | 6525e67c01d303153272c26cb8118a3c314f4a1f (patch) | |
tree | a92d9f9a168326d837ded0dc2627cc376c3cf58c /drivers/media/dvb | |
parent | 684688d87d697724c46be77858641ee2e8885b02 (diff) |
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 <o.endriss@gmx.de>
Thanks-to: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/ngene/ngene-core.c | 7 |
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 | ||