From: Devin Heitmueller <devin.heitmueller@gmail.com>
Date: Wed, 12 Nov 2008 05:04:48 +0000 (-0300)
Subject: V4L/DVB (9580): Add chip id for em2874 to list of known chips
X-Git-Tag: firefly_0821_release~16456^2~412
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5caeba045c3a676b892790c6685e542f81a4f96e;p=firefly-linux-kernel-4.4.55.git

V4L/DVB (9580): Add chip id for em2874 to list of known chips

Add em2874 chip id

Add chip id for em2874 to list of known chips

Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index d65d0572403b..d93e1eb04331 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/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/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index fac1ab23f621..0892df17f183 100644
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/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,
 };