diff options
| author | Devin Heitmueller <devin.heitmueller@gmail.com> | 2008-11-12 02:04:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 17:53:31 -0200 |
| commit | 5caeba045c3a676b892790c6685e542f81a4f96e (patch) | |
| tree | 1987be233a6a0116b56b5672636d09dc43374ee2 /drivers/media | |
| parent | a56a18c3ed3442a0c049c9b5f0dda918a6e83726 (diff) | |
| download | kernel-crypto-5caeba045c3a676b892790c6685e542f81a4f96e.tar.gz kernel-crypto-5caeba045c3a676b892790c6685e542f81a4f96e.tar.xz kernel-crypto-5caeba045c3a676b892790c6685e542f81a4f96e.zip | |
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>
Diffstat (limited to 'drivers/media')
| -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 d65d0572403..d93e1eb0433 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) 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 fac1ab23f62..0892df17f18 100644 --- 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, }; |