From c60aba8bf8e85fb6418ac5f13667a735898b112f Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 15 Sep 2010 16:14:57 -0300 Subject: [PATCH] --- yaml --- r: 219155 b: refs/heads/master c: a644c072ea2a0ba9bd46430a4710cc3ac7cbdc21 h: refs/heads/master i: 219153: 2f68336f173ed34053a9923a30175e77fcd8dcb5 219151: 618291df68cf68808f807ccaac0f65655a00248d v: v3 --- [refs] | 2 +- trunk/drivers/media/common/saa7146_i2c.c | 1 - trunk/drivers/media/video/tuner-core.c | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 10db1a5e4067..68008ce6887b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1edc246c32dafd03979a341eec2528b7cdf5c37d +refs/heads/master: a644c072ea2a0ba9bd46430a4710cc3ac7cbdc21 diff --git a/trunk/drivers/media/common/saa7146_i2c.c b/trunk/drivers/media/common/saa7146_i2c.c index 48cb154c7a46..3d88542612ea 100644 --- a/trunk/drivers/media/common/saa7146_i2c.c +++ b/trunk/drivers/media/common/saa7146_i2c.c @@ -414,7 +414,6 @@ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c i2c_adapter->dev.parent = &dev->pci->dev; i2c_adapter->algo = &saa7146_algo; i2c_adapter->algo_data = NULL; - i2c_adapter->id = I2C_HW_SAA7146; i2c_adapter->timeout = SAA7146_I2C_TIMEOUT; i2c_adapter->retries = SAA7146_I2C_RETRIES; } diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c index a3bb9e90f1dd..e32146680b37 100644 --- a/trunk/drivers/media/video/tuner-core.c +++ b/trunk/drivers/media/video/tuner-core.c @@ -1052,12 +1052,6 @@ static int tuner_probe(struct i2c_client *client, printk(KERN_CONT "%02x ", buffer[i]); printk("\n"); } - /* HACK: This test was added to avoid tuner to probe tda9840 and - tea6415c on the MXB card */ - if (client->adapter->id == I2C_HW_SAA7146 && client->addr < 0x4a) { - kfree(t); - return -ENODEV; - } /* autodetection code based on the i2c addr */ if (!no_autodetect) {