V4L/DVB (9921): em28xx: add chip id for em2874

Add the em2870 to the list of known em28xx chip ids.

Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
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 fecfe170b36e28715f27b242e007461c52c41c70..4b78a03528f525fbdd4d7148397e9595f07ea26f 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1409,6 +1409,10 @@ void em28xx_pre_card_setup(struct em28xx *dev)
                case CHIP_ID_EM2860:
                        em28xx_info("chip ID is em2860\n");
                        break;
+               case CHIP_ID_EM2870:
+                       em28xx_info("chip ID is em2870\n");
+                       dev->wait_after_write = 0;
+                       break;
                case CHIP_ID_EM2874:
                        em28xx_info("chip ID is em2874\n");
                        dev->reg_gpio_num = EM2874_R80_GPIO;

diff --git a/drivers/media/video/em28xx/em28xx-reg.h b/drivers/media/video/em28xx/em28xx-reg.h
index 45d588c3a6c59946a6ce601a0c798b9389f8ae80..a459b7c6a6c9085932eb8552a07064915316f621 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-reg.h
+++ b/drivers/media/video/em28xx/em28xx-reg.h
@@ -151,6 +151,7 @@ enum em28xx_chip_id {
        CHIP_ID_EM2840 = 20,
        CHIP_ID_EM2750 = 33,
        CHIP_ID_EM2860 = 34,
+       CHIP_ID_EM2870 = 35,
        CHIP_ID_EM2883 = 36,
        CHIP_ID_EM2874 = 65,
 };