---

yaml
---
r: 14868
b: refs/heads/master
c: 0fe2286
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbf7871e1cd58b89f77b1152f457250c6e94b614
+refs/heads/master: 0fe22865ddee524017a1012528b0e15475acc942

trunk/drivers/media/video/cx88/cx88-cards.c

@@ -1088,11 +1088,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
 	switch (tv.model)
 	{
 	case 90002: /* Nova-T-PCI (9002) */
+	case 92001: /* Nova-S-Plus (Video and IR) */
+	case 92002: /* Nova-S-Plus (Video and IR) */
+	case 90003: /* Nova-T-PCI (9002 No RF out) */
 	case 90500: /* Nova-T-PCI (oem) */
 	case 90501: /* Nova-T-PCI (oem/IR) */
 	case 92000: /* Nova-SE2 (OEM, No Video or IR) */
-	case 92001: /* Nova-S-Plus (Video and IR) */
-	case 92002: /* Nova-S-Plus (Video and IR) */
+
 		/* known */
 		break;
 	default:

trunk/drivers/media/video/tveeprom.c

@@ -382,14 +382,15 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
 	memset(tvee, 0, sizeof(*tvee));
 	done = len = beenhere = 0;
 
-	/* Hack for processing eeprom for em28xx */
+	/* Hack for processing eeprom for em28xx and cx 2388x*/
 	if ((eeprom_data[0] == 0x1a) && (eeprom_data[1] == 0xeb) &&
-		(eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95))
-		start=0xa0;
-	else if ((eeprom_data[0] == 0x1f) && (eeprom_data[8] == 0x84))
-		start=8;
-	else if ((eeprom_data[0] == 0x17) && (eeprom_data[8] == 0x84))
-		start=8;
+			(eeprom_data[2] == 0x67) && (eeprom_data[3] == 0x95))
+		start=0xa0; /* Generic em28xx offset */
+	else if (((eeprom_data[0] & 0xf0) == 0x10) &&
+					(eeprom_data[1] == 0x00) &&
+					(eeprom_data[2] == 0x00) &&
+					(eeprom_data[8] == 0x84))
+		start=8; /* Generic cx2388x offset */
 	else
 		start=0;