summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/tveeprom.c2
-rw-r--r--v4l/ChangeLog9
2 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index 70676af9b..091493c13 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -404,7 +404,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) &&
(eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95))
start=0xa0; /* Generic em28xx offset */
- else if (((eeprom_data[0] & 0xf0) == 0x10) &&
+ else if (((eeprom_data[0] & 0xe1) == 0x01) &&
(eeprom_data[1] == 0x00) &&
(eeprom_data[2] == 0x00) &&
(eeprom_data[8] == 0x84))
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 743ff72e3..9e88b439a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-10 14:39 mchehab
+
+ * linux/drivers/media/video/tveeprom.c:
+ (tveeprom_hauppauge_analog):
+ - Updates to the tveeprom eeprom checking
+
+ Signed-of-by: Steven Toth <stoth@hauppauge.com>
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-10 09:58 mchehab
* linux/drivers/media/video/msp3400.c: