diff options
author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-09-30 21:44:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:40:14 -0500 |
commit | f91cb65b94114f30cf43738ff923f272e4f2ae13 (patch) | |
tree | aa3f38506ab209266886f35f1322226793c3ace2 | |
parent | 496e9057adf55d0e6c9be3805f0bc61288409317 (diff) |
V4L/DVB (13077): em28xx: Add support for new variant of KWorld 2800d
Seems that the reference design used for the KWorld 2800d switched from the
em2860 to em2862, so we need to add the new USB id (and the i2c hash remains
so all we need is the default em2862 id.
Thanks to Ian Young for reporting the issue and testing the fix.
Cc: Ian Young <ian@duffrecords.com>
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/video4linux/CARDLIST.em28xx | 2 | ||||
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx index b8afef4c0e01..f8ea8acdd894 100644 --- a/Documentation/video4linux/CARDLIST.em28xx +++ b/Documentation/video4linux/CARDLIST.em28xx | |||
@@ -1,5 +1,5 @@ | |||
1 | 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] | 1 | 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800] |
2 | 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868] | 2 | 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868] |
3 | 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] | 3 | 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036] |
4 | 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] | 4 | 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208] |
5 | 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201] | 5 | 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201] |
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index c0fd5c6feeac..a41256f78d6a 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -1608,6 +1608,8 @@ struct usb_device_id em28xx_id_table[] = { | |||
1608 | .driver_info = EM2820_BOARD_UNKNOWN }, | 1608 | .driver_info = EM2820_BOARD_UNKNOWN }, |
1609 | { USB_DEVICE(0xeb1a, 0x2861), | 1609 | { USB_DEVICE(0xeb1a, 0x2861), |
1610 | .driver_info = EM2820_BOARD_UNKNOWN }, | 1610 | .driver_info = EM2820_BOARD_UNKNOWN }, |
1611 | { USB_DEVICE(0xeb1a, 0x2862), | ||
1612 | .driver_info = EM2820_BOARD_UNKNOWN }, | ||
1611 | { USB_DEVICE(0xeb1a, 0x2870), | 1613 | { USB_DEVICE(0xeb1a, 0x2870), |
1612 | .driver_info = EM2820_BOARD_UNKNOWN }, | 1614 | .driver_info = EM2820_BOARD_UNKNOWN }, |
1613 | { USB_DEVICE(0xeb1a, 0x2881), | 1615 | { USB_DEVICE(0xeb1a, 0x2881), |