summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-08-01 21:11:38 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-01 21:37:59 -0700
commit001abc93bf83f95737cd455b6ec875e6412f7d53 (patch)
tree50c99726fa7ad9a450d083bd498a7ecac8f95808
parent43f2f3d343f9d00a94a9242547a59d9dfb2338c4 (diff)
downloadconfigs-001abc93bf83f95737cd455b6ec875e6412f7d53.tar.gz
[PATCH] v4l: bug fix to correct tea5767 autodetection
This patch does correct radio chip autodetection to avoid misdetecting mt20xx microtune as tea5767 chip. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/media/video/tea5767.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/media/video/tea5767.c b/drivers/media/video/tea5767.c
index c8fd4204cd0..cebcc1fa68d 100644
--- a/drivers/media/video/tea5767.c
+++ b/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
* For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
* I2C address is allways 0xC0.
*
- * $Id: tea5767.c,v 1.26 2005/07/27 12:00:36 mkrufky Exp $
+ * $Id: tea5767.c,v 1.27 2005/07/31 12:10:56 mchehab Exp $
*
* Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
* This code is placed under the terms of the GNU General Public License
@@ -296,7 +296,7 @@ int tea5767_autodetection(struct i2c_client *c)
int rc;
struct tuner *t = i2c_get_clientdata(c);
- if (5 != (rc = i2c_master_recv(c, buffer, 5))) {
+ if (7 != (rc = i2c_master_recv(c, buffer, 7))) {
tuner_warn("It is not a TEA5767. Received %i bytes.\n", rc);
return EINVAL;
}
@@ -323,6 +323,12 @@ int tea5767_autodetection(struct i2c_client *c)
return EINVAL;
}
+ /* It seems that tea5767 returns 0xff after the 5th byte */
+ if ((buffer[5] != 0xff) || (buffer[6] != 0xff)) {
+ tuner_warn("Returned more than 5 bytes. It is not a TEA5767\n");
+ return EINVAL;
+ }
+
tuner_warn("TEA5767 detected.\n");
return 0;
}
@@ -331,7 +337,8 @@ int tea5767_tuner_init(struct i2c_client *c)
{
struct tuner *t = i2c_get_clientdata(c);
- tuner_info("type set to %d (%s)\n", t->type, "Philips TEA5767HN FM Radio");
+ tuner_info("type set to %d (%s)\n", t->type,
+ "Philips TEA5767HN FM Radio");
strlcpy(c->name, "tea5767", sizeof(c->name));
t->tv_freq = set_tv_freq;