aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tveeprom.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/tveeprom.c')
-rw-r--r--drivers/media/video/tveeprom.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d6afd918f324..f048fd44f0e2 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -382,14 +382,15 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
382 memset(tvee, 0, sizeof(*tvee)); 382 memset(tvee, 0, sizeof(*tvee));
383 done = len = beenhere = 0; 383 done = len = beenhere = 0;
384 384
385 /* Hack for processing eeprom for em28xx */ 385 /* Hack for processing eeprom for em28xx and cx 2388x*/
386 if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) && 386 if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) &&
387 (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95)) 387 (eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95))
388 start=0xa0; 388 start=0xa0; /* Generic em28xx offset */
389 else if ((eeprom_data[0] == 0x1f) && (eeprom_data[8] == 0x84)) 389 else if (((eeprom_data[0] & 0xf0) == 0x10) &&
390 start=8; 390 (eeprom_data[1] == 0x00) &&
391 else if ((eeprom_data[0] == 0x17) && (eeprom_data[8] == 0x84)) 391 (eeprom_data[2] == 0x00) &&
392 start=8; 392 (eeprom_data[8] == 0x84))
393 start=8; /* Generic cx2388x offset */
393 else 394 else
394 start=0; 395 start=0;
395 396