aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
-rw-r--r--drivers/media/video/em28xx/em28xx-reg.h1
2 files changed, 5 insertions, 0 deletions
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)
1323 case CHIP_ID_EM2860: 1323 case CHIP_ID_EM2860:
1324 em28xx_info("chip ID is em2860\n"); 1324 em28xx_info("chip ID is em2860\n");
1325 break; 1325 break;
1326 case CHIP_ID_EM2874:
1327 em28xx_info("chip ID is em2874\n");
1328 dev->wait_after_write = 0;
1329 break;
1326 case CHIP_ID_EM2883: 1330 case CHIP_ID_EM2883:
1327 em28xx_info("chip ID is em2882/em2883\n"); 1331 em28xx_info("chip ID is em2882/em2883\n");
1328 dev->wait_after_write = 0; 1332 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 @@
86enum em28xx_chip_id { 86enum em28xx_chip_id {
87 CHIP_ID_EM2860 = 34, 87 CHIP_ID_EM2860 = 34,
88 CHIP_ID_EM2883 = 36, 88 CHIP_ID_EM2883 = 36,
89 CHIP_ID_EM2874 = 65,
89}; 90};