aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-01-21 10:01:34 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:05:11 -0500
commit1641002bf56c1da265f2c49ea1c29baba997e63b (patch)
tree61b9247e1f521ab702fea6e497e7adf1bcc66730
parent0f2ce9834246519e483e89dbc7225fe1fcbd30a8 (diff)
V4L/DVB (7056): tuner: suppress obsolete tuner i2c address warning for XC5000 tuners
We already know that the XC5000 tuner can only be located at i2c address 0x61, 0x62, 0x63 or 0x64 We shouldn't display this warning if the XC5000 tuner is present. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/tuner-core.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 8e406b168d71..ba538f6fbcc3 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -297,6 +297,12 @@ static void tuner_i2c_address_check(struct tuner *t)
297 ((t->i2c->addr < 0x64) || (t->i2c->addr > 0x6f))) 297 ((t->i2c->addr < 0x64) || (t->i2c->addr > 0x6f)))
298 return; 298 return;
299 299
300 /* We already know that the XC5000 can only be located at
301 * i2c address 0x61, 0x62, 0x63 or 0x64 */
302 if ((t->type == TUNER_XC5000) &&
303 ((t->i2c->addr <= 0x64)) && (t->i2c->addr >= 0x61))
304 return;
305
300 tuner_warn("====================== WARNING! ======================\n"); 306 tuner_warn("====================== WARNING! ======================\n");
301 tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n"); 307 tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n");
302 tuner_warn("will soon be dropped. This message indicates that your\n"); 308 tuner_warn("will soon be dropped. This message indicates that your\n");