---

yaml --- r: 124178 b: refs/heads/master c: 5caeba0 h: refs/heads/master v: v3
git-mirror · Dec 29, 2008 · 59be842 · 59be842
1 parent 129261b
commit 59be842
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a56a18c3ed3442a0c049c9b5f0dda918a6e83726
+refs/heads/master: 5caeba045c3a676b892790c6685e542f81a4f96e
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1323,6 +1323,10 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 		case CHIP_ID_EM2860:
 			em28xx_info("chip ID is em2860\n");
 			break;
+		case CHIP_ID_EM2874:
+			em28xx_info("chip ID is em2874\n");
+			dev->wait_after_write = 0;
+			break;
 		case CHIP_ID_EM2883:
 			em28xx_info("chip ID is em2882/em2883\n");
 			dev->wait_after_write = 0;

diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h
@@ -86,4 +86,5 @@
 enum em28xx_chip_id {
 	CHIP_ID_EM2860 = 34,
 	CHIP_ID_EM2883 = 36,
+	CHIP_ID_EM2874 = 65,
 };