---

yaml --- r: 156773 b: refs/heads/master c: d594317 h: refs/heads/master i: 156771: 5b3d5d4 v: v3
git-mirror · Aug 13, 2009 · a86ac1f · a86ac1f
1 parent a86fbea
commit a86ac1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b4e845c6cbca2bcbfdb87e4d005260604226f45
+refs/heads/master: d594317bdc716ccd8c8cf711e3827f9b6e0b766b
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1840,11 +1840,14 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 		dev->chip_id = rc;
 
 		switch (dev->chip_id) {
+		case CHIP_ID_EM2710:
+			em28xx_info("chip ID is em2710\n");
+			break;
 		case CHIP_ID_EM2750:
 			em28xx_info("chip ID is em2750\n");
 			break;
 		case CHIP_ID_EM2820:
-			em28xx_info("chip ID is em2710 or em2820\n");
+			em28xx_info("chip ID is em2820 (or em2710)\n");
 			break;
 		case CHIP_ID_EM2840:
 			em28xx_info("chip ID is em2840\n");

diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h
@@ -176,7 +176,8 @@
 
 /* FIXME: Need to be populated with the other chip ID's */
 enum em28xx_chip_id {
-	CHIP_ID_EM2820 = 18,	/* Also used by em2710 */
+	CHIP_ID_EM2710 = 17,
+	CHIP_ID_EM2820 = 18,	/* Also used by some em2710 */
 	CHIP_ID_EM2840 = 20,
 	CHIP_ID_EM2750 = 33,
 	CHIP_ID_EM2860 = 34,