From c6b0fea43df0dc85869c9316d065e0542aee6978 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 21 Jan 2008 12:01:34 -0300 Subject: [PATCH] --- yaml --- r: 76763 b: refs/heads/master c: 1641002bf56c1da265f2c49ea1c29baba997e63b h: refs/heads/master i: 76761: 5390953bed9838ad32510f267467b47354c6e177 76759: bf18f0fee4be379c351300c05e32ae4ba33eff7a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/tuner-core.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5463cbfd6657..1fdb7e5ccf84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f2ce9834246519e483e89dbc7225fe1fcbd30a8 +refs/heads/master: 1641002bf56c1da265f2c49ea1c29baba997e63b diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c index 8e406b168d71..ba538f6fbcc3 100644 --- a/trunk/drivers/media/video/tuner-core.c +++ b/trunk/drivers/media/video/tuner-core.c @@ -297,6 +297,12 @@ static void tuner_i2c_address_check(struct tuner *t) ((t->i2c->addr < 0x64) || (t->i2c->addr > 0x6f))) return; + /* We already know that the XC5000 can only be located at + * i2c address 0x61, 0x62, 0x63 or 0x64 */ + if ((t->type == TUNER_XC5000) && + ((t->i2c->addr <= 0x64)) && (t->i2c->addr >= 0x61)) + return; + tuner_warn("====================== WARNING! ======================\n"); tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n"); tuner_warn("will soon be dropped. This message indicates that your\n");