From b7f8945ae633e4b55dc87fd8dbb305ef0c68aaa2 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 1 Jul 2005 20:13:29 +0000 Subject: 2005-06-01 20:40 mchehab * tuner-core.c: - it is printk, not dprintk! Fixed. - new debug info when tuner is specified as tea5767 but autodetection doesn't recognize. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/tuner-core.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 040647c0d..624430722 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-core.c,v 1.39 2005/07/01 17:50:10 mchehab Exp $ + * $Id: tuner-core.c,v 1.40 2005/07/01 20:13:29 mchehab Exp $ * * i2c tv tuner chip device driver * core core, i.e. kernel interfaces, registering and so on @@ -148,32 +148,35 @@ static void set_type(struct i2c_client *c, unsigned int type, /* sanity check */ if (type == UNSET || type == TUNER_ABSENT) { - dprintk("tuner 0x%02x: Tuner type absent\n",c->addr); + printk("tuner 0x%02x: Tuner type absent\n",c->addr); return; } if (type >= tuner_count) { - dprintk("tuner 0x%02x: Tuner count greater than %d\n",c->addr,tuner_count); + printk("tuner 0x%02x: Tuner count greater than %d\n",c->addr,tuner_count); return; } /* This code prevents against I2C early announces */ if (NULL == t->i2c.dev.driver) { - dprintk("tuner 0x%02x: I2C driver not registred yet!\n",c->addr); + printk("tuner 0x%02x: I2C driver not registred yet!\n",c->addr); for (i=0;(i<5)&&(NULL == t->i2c.dev.driver);i++) { msleep(1); /* Giver 1 ms for I2C */ } if (NULL == t->i2c.dev.driver) { - dprintk("tuner 0x%02x: I2C driver still not registred. Giving up!\n",c->addr); + printk("tuner 0x%02x: I2C driver still not registred. Giving up!\n",c->addr); t->type=type; /* not registered yet */ return; } + tuner_info("tuner 0x%02x: Workaround worked\n",c->addr); } + /* if ((t->admin_status==T_UNINITIALIZED) && (t->type == type)) return; */ + tuner_dbg("set tuner type to %d\n",type); t->type = type; switch (t->type) { case TUNER_MT2032: @@ -184,6 +187,7 @@ static void set_type(struct i2c_client *c, unsigned int type, break; case TUNER_TEA5767: if (tea5767_tuner_init(c) == EINVAL) { + tuner_dbg("tuner is not a tea5767!\n"); t->type = TUNER_ABSENT; t->admin_status = T_UNINITIALIZED; return; -- cgit v1.2.3