From: Oliver Endriss Date: Thu, 4 Feb 2010 01:06:15 +0000 (-0300) Subject: V4L/DVB: ngene: Fix I2C initialisation X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6525e67c01d303153272c26cb8118a3c314f4a1f;p=linux-beck.git 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 Thanks-to: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- 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); }