summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/tea5767.c5
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index eba4116ba..5331301e9 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/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
@@ -321,13 +321,12 @@ int tea5767_autodetection(struct i2c_client *c)
tuner_warn("Chip ID is not zero. It is not a TEA5767\n");
return EINVAL;
}
-#if 1 /* On CX88, this works. Must be tested with other chipsets */
+
/* 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;
}
-#endif
#if 0 /*Sometimes, this code doesn't work */
/* Sets tuner at some freq (87.5 MHz) and see if it is ok */
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 76956280d..1af6cd089 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-31 12:07 mchehab
+
+ * tea5767.c:
+ - removed #if 1 from newer tea autodetection code.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-07-30 19:40 mkrufky
* bttv-driver.c, msp3400.c, tda9887.c, tuner-core.c:
* Makefile, scripts/merge-trees.sh, scripts/unmerge-trees.sh: