From 773deb53a22ffd7a04f5e503ffc04ef04dbf2964 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Wed, 3 Feb 2010 22:06:15 -0300 Subject: [PATCH] --- yaml --- r: 181655 b: refs/heads/master c: 6525e67c01d303153272c26cb8118a3c314f4a1f h: refs/heads/master i: 181653: 0e8a1ecffe8c86a59c0490daac98c5d1d2e3ba7b 181651: c52ee9def1dda20cf2d911f5542faf0bb4c0af71 181647: d4aa7de059eddab5693e4a207646433df9733e90 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ngene/ngene-core.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ac18fed96a62..cdf175f9cf5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 684688d87d697724c46be77858641ee2e8885b02 +refs/heads/master: 6525e67c01d303153272c26cb8118a3c314f4a1f diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c index 1b53482f6e7f..ea610e4b571d 100644 --- a/trunk/drivers/media/dvb/ngene/ngene-core.c +++ b/trunk/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); }