V4L/DVB: saa7146/tuner: remove mxb hack

Remove a hack in the tuner code for the mxb board. This hack is no longer
needed since the tuner is now probed on its correct address as specified
by the mxb driver.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 48cb154c7a46bac6223118074808d14a1e38061f..3d88542612eabfffc799a348c88c8c4a1bf551df 100644 (file)
--- a/drivers/media/common/saa7146_i2c.c
+++ b/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/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index a3bb9e90f1dd9e623317b59f6afe34d9922a7964..e32146680b372a3982d88e88eb17da75cc7a4791 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/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) {