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 d65d0572403bbd29f77675bcaf995284e0cdd466..d93e1eb043311ed015833bb70cd1244403282afa 100644 (file)
--- 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 fac1ab23f6216dd74d4fcbc0a65fd26868d0fcd6..0892df17f1831a48be2f67a1e9d85b09c078ec91 100644 (file)
--- 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,
 };