Skip to content

Commit

Permalink
V4L/DVB: ngene: Fix I2C initialisation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Oliver Endriss authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent 684688d commit 6525e67
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/media/dvb/ngene/ngene-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -847,19 +847,14 @@ 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");

adap->algo = &ngene_i2c_algo;
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);
}

Expand Down

0 comments on commit 6525e67

Please sign in to comment.