---

yaml --- r: 124200 b: refs/heads/master c: f09fb53 h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · 90e346c · 90e346c
1 parent 1a1bed0
commit 90e346c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 802971257a3b897d2affd39e540be264bae89c3b
+refs/heads/master: f09fb53075646c35efe0f74d97b7c4bc7ec61e5a
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1355,6 +1355,12 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 	if (rc > 0) {
 		dev->chip_id = rc;
 		switch (rc) {
+		case CHIP_ID_EM2820:
+			em28xx_info("chip ID is em2820\n");
+			break;
+		case CHIP_ID_EM2840:
+			em28xx_info("chip ID is em2840\n");
+			break;
 		case CHIP_ID_EM2860:
 			em28xx_info("chip ID is em2860\n");
 			break;

diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h
@@ -111,6 +111,8 @@
 
 /* FIXME: Need to be populated with the other chip ID's */
 enum em28xx_chip_id {
+	CHIP_ID_EM2820 = 18,
+	CHIP_ID_EM2840 = 20,
 	CHIP_ID_EM2860 = 34,
 	CHIP_ID_EM2883 = 36,
 	CHIP_ID_EM2874 = 65,