aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorPhilippe Bourdin <richel@AngieBecker.ch>2010-10-31 08:57:58 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:58 -0500
commit9124544320bd36d5aa21769d17a5781ba729aebf (patch)
tree9498f387908908c188a0351cf3b2d5ffd0ba1e71 /drivers/media/video/em28xx/em28xx-cards.c
parentb395cbac36e58a55729fe7e6262a3f0b1691bced (diff)
[media] Terratec Cinergy Hybrid T USB XS
I found that the problems people have reported with the USB-TV-stick "Terratec Cinergy Hybrid T USB XS" (USB-ID: 0ccd:0042) are coming from a wrong header file in the v4l-sources. Attached is a diff, which fixes the problem (tested successfully here). Obviously the USB-ID has been associated with a wrong chip: EM2880 instead of EM2882, which would be correct. Reported-by: Philippe Bourdin <richel@AngieBecker.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index ed25c5579c3..5d79d0eb64a 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1496,7 +1496,7 @@ struct em28xx_board em28xx_boards[] = {
1496 } }, 1496 } },
1497 }, 1497 },
1498 [EM2882_BOARD_TERRATEC_HYBRID_XS] = { 1498 [EM2882_BOARD_TERRATEC_HYBRID_XS] = {
1499 .name = "Terratec Hybrid XS (em2882)", 1499 .name = "Terratec Cinnergy Hybrid T USB XS (em2882)",
1500 .tuner_type = TUNER_XC2028, 1500 .tuner_type = TUNER_XC2028,
1501 .tuner_gpio = default_tuner_gpio, 1501 .tuner_gpio = default_tuner_gpio,
1502 .mts_firmware = 1, 1502 .mts_firmware = 1,
@@ -1820,7 +1820,7 @@ struct usb_device_id em28xx_id_table[] = {
1820 { USB_DEVICE(0x0ccd, 0x005e), 1820 { USB_DEVICE(0x0ccd, 0x005e),
1821 .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS }, 1821 .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },
1822 { USB_DEVICE(0x0ccd, 0x0042), 1822 { USB_DEVICE(0x0ccd, 0x0042),
1823 .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS }, 1823 .driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },
1824 { USB_DEVICE(0x0ccd, 0x0043), 1824 { USB_DEVICE(0x0ccd, 0x0043),
1825 .driver_info = EM2870_BOARD_TERRATEC_XS }, 1825 .driver_info = EM2870_BOARD_TERRATEC_XS },
1826 { USB_DEVICE(0x0ccd, 0x0047), 1826 { USB_DEVICE(0x0ccd, 0x0047),