summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/tvaudio.c9
-rw-r--r--v4l/ChangeLog8
2 files changed, 17 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c
index 4e1bc3f52..792724258 100644
--- a/linux/drivers/media/video/tvaudio.c
+++ b/linux/drivers/media/video/tvaudio.c
@@ -404,6 +404,14 @@ static void tda9840_setmode(struct CHIPSTATE *chip, int mode)
chip_write(chip, TDA9840_SW, t);
}
+static int tda9840_checkit(struct CHIPSTATE *chip)
+{
+ int rc;
+ rc = chip_read(chip);
+ /* lower 5 bits should be 0 */
+ return ((rc & 0x1f) == 0) ? 1 : 0;
+}
+
/* ---------------------------------------------------------------------- */
/* audio chip descriptions - defines+functions for tda985x */
@@ -1283,6 +1291,7 @@ static struct CHIPDESC chiplist[] = {
.addr_hi = I2C_TDA9840 >> 1,
.registers = 5,
+ .checkit = tda9840_checkit,
.getmode = tda9840_getmode,
.setmode = tda9840_setmode,
.checkmode = generic_checkmode,
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 8c368a397..be14ff9f3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-18 21:49 hverkuil
+
+ * linux/drivers/media/video/tvaudio.c: (tda9840_checkit):
+ Add probe check for the tda9840 to prevent misdetection of
+ a Micronas dpl3518a as a tda9840.
+
+ Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+
2006-01-18 21:29 hverkuil
* linux/drivers/media/video/msp3400-driver.c: