summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2010-02-04 02:06:15 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 19:10:55 +0100
commit6525e67c01d303153272c26cb8118a3c314f4a1f (patch)
treea92d9f9a168326d837ded0dc2627cc376c3cf58c /drivers/media/dvb
parentV4L/DVB: ngene: Make checkpatch.pl happy (diff)
downloadlinux-6525e67c01d303153272c26cb8118a3c314f4a1f.tar.xz
linux-6525e67c01d303153272c26cb8118a3c314f4a1f.zip
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.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)
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);
}