From 82bab855ef7cc0709249365f9ea764ea1d82cac2 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Tue, 28 Nov 2006 08:14:44 -0300 Subject: [PATCH] --- yaml --- r: 44107 b: refs/heads/master c: c28089a65ca03890db120ee2bf6a7eb0cf603817 h: refs/heads/master i: 44105: 34888be5539bffe804c880ec1355ce2206cb3a10 44103: bd06a7e612c17eededaeb2fdd04f94a3e2398782 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d5c7183f9516..1ec280f232c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a08cc44ec12e0a994ee85ba365315dbee982d6a7 +refs/heads/master: c28089a65ca03890db120ee2bf6a7eb0cf603817 diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c index 40590bae5ff7..705daaa2a4ff 100644 --- a/trunk/drivers/media/video/tuner-core.c +++ b/trunk/drivers/media/video/tuner-core.c @@ -443,6 +443,10 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) printk("%02x ",buffer[i]); printk("\n"); } + /* HACK: This test were added to avoid tuner to probe tda9840 and tea6415c on the MXB card */ + if (adap->id == I2C_HW_SAA7146 && addr < 0x4a) + return -ENODEV; + /* autodetection code based on the i2c addr */ if (!no_autodetect) { switch (addr) {