diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-17 05:15:33 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 14:39:18 +0300 |
| commit | b1fa26c66c975bbd3173a45ef673870fd1d52dea (patch) | |
| tree | 72f7362e3afbfb540f2eb3754e81a8e12ffef09e /drivers/media/video/em28xx | |
| parent | 793927372626bae48b32db24dddde40d73923a9c (diff) | |
| download | linux-b1fa26c66c975bbd3173a45ef673870fd1d52dea.tar.xz | |
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>
Diffstat (limited to 'drivers/media/video/em28xx')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-reg.h | 1 |
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 fecfe170b36e..4b78a03528f5 100644 --- 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 45d588c3a6c5..a459b7c6a6c9 100644 --- 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, }; |