diff options
| author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-16 21:15:33 -0500 |
|---|---|---|
| committer | Devin Heitmueller <dheitmueller@linuxtv.org> | 2008-12-16 21:15:33 -0500 |
| commit | 92b4058a43959c8e3cba8044d4bd3adba9cabdd5 (patch) | |
| tree | 445a970a9d45a2b0f54fdb296edf3d7e455d03d4 /linux/drivers/media/video | |
| parent | 0d788195b491c7c18524b30618f44059eb35bc06 (diff) | |
| download | mediapointer-dvb-s2-92b4058a43959c8e3cba8044d4bd3adba9cabdd5.tar.gz mediapointer-dvb-s2-92b4058a43959c8e3cba8044d4bd3adba9cabdd5.tar.bz2 | |
em28xx: add chip id for em2874
From: Devin Heitmueller <dheitmueller@linuxtv.org>
Add the em2870 to the list of known em28xx chip ids.
Priority: normal
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-reg.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index 2ecc98af7..3eb4408b4 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -1480,6 +1480,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/linux/drivers/media/video/em28xx/em28xx-reg.h b/linux/drivers/media/video/em28xx/em28xx-reg.h index 45d588c3a..a459b7c6a 100644 --- a/linux/drivers/media/video/em28xx/em28xx-reg.h +++ b/linux/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, }; |