From: Mauro Carvalho Chehab <mchehab@redhat.com>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Subject: [PATCH 3/8] [media] em28xx: Fix some Terratec entries (H5 and XS)
Date: Sun, 20 Nov 2011 12:56:13 -0200 [thread overview]
Message-ID: <1321800978-27912-3-git-send-email-mchehab@redhat.com> (raw)
In-Reply-To: <1321800978-27912-2-git-send-email-mchehab@redhat.com>
As reported by Andreas Oberritter <obi@linuxtv.org>, changeset
33ba28eebc3e1758e6adc1fcec9e1e3151bac453 did the wrong thing.
Fix it to properly reflect the entries for Terratec H5 revs 1 and 2,
and restore Terratec XS entry.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
Documentation/video4linux/CARDLIST.em28xx | 6 +++---
drivers/media/video/em28xx/em28xx-cards.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index d8c8544..7734b2c 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -11,7 +11,7 @@
10 -> Hauppauge WinTV HVR 900 (em2880) [2040:6500]
11 -> Terratec Hybrid XS (em2880)
12 -> Kworld PVR TV 2800 RF (em2820/em2840)
- 13 -> Terratec Prodigy XS (em2880) [0ccd:10ad]
+ 13 -> Terratec Prodigy XS (em2880)
14 -> SIIG AVTuner-PVR / Pixelview Prolink PlayTV USB 2.0 (em2820/em2840)
15 -> V-Gear PocketTV (em2800)
16 -> Hauppauge WinTV HVR 950 (em2883) [2040:6513,2040:6517,2040:651b]
@@ -41,7 +41,7 @@
40 -> Plextor ConvertX PX-TV100U (em2861) [093b:a005]
41 -> Kworld 350 U DVB-T (em2870) [eb1a:e350]
42 -> Kworld 355 U DVB-T (em2870) [eb1a:e355,eb1a:e357]
- 43 -> Terratec Cinergy T XS (em2870)
+ 43 -> Terratec Cinergy T XS (em2870) [0ccd:0043]
44 -> Terratec Cinergy T XS (MT2060) (em2870)
45 -> Pinnacle PCTV DVB-T (em2870)
46 -> Compro, VideoMate U3 (em2870) [185b:2870]
@@ -76,5 +76,5 @@
76 -> KWorld PlusTV 340U or UB435-Q (ATSC) (em2870) [1b80:a340]
77 -> EM2874 Leadership ISDBT (em2874)
78 -> PCTV nanoStick T2 290e (em28174)
- 79 -> Terratec Cinergy H5 (em2884) [0ccd:0043,0ccd:10a2]
+ 79 -> Terratec Cinergy H5 (em2884) [0ccd:10a2,0ccd:10ad]
80 -> PCTV DVB-S2 Stick (460e) (em28174)
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 9b747c2..19a5be3 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1914,11 +1914,11 @@ struct usb_device_id em28xx_id_table[] = {
{ USB_DEVICE(0x0ccd, 0x0042),
.driver_info = EM2882_BOARD_TERRATEC_HYBRID_XS },
{ USB_DEVICE(0x0ccd, 0x0043),
+ .driver_info = EM2870_BOARD_TERRATEC_XS },
+ { USB_DEVICE(0x0ccd, 0x10a2), /* H5 Rev. 1 */
.driver_info = EM2884_BOARD_TERRATEC_H5 },
- { USB_DEVICE(0x0ccd, 0x10a2), /* Rev. 1 */
+ { USB_DEVICE(0x0ccd, 0x10ad), /* H5 Rev. 2 */
.driver_info = EM2884_BOARD_TERRATEC_H5 },
- { USB_DEVICE(0x0ccd, 0x10ad), /* Rev. 2 */
- .driver_info = EM2880_BOARD_TERRATEC_PRODIGY_XS },
{ USB_DEVICE(0x0ccd, 0x0084),
.driver_info = EM2860_BOARD_TERRATEC_AV350 },
{ USB_DEVICE(0x0ccd, 0x0096),
--
1.7.7.1
next prev parent reply other threads:[~2011-11-20 14:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-20 14:56 [PATCH 1/8] [media] dvb: Allow select between DVB-C Annex A and Annex C Mauro Carvalho Chehab
2011-11-20 14:56 ` [PATCH 2/8] [media] Properly implement ITU-T J.88 Annex C support Mauro Carvalho Chehab
2011-11-20 14:56 ` Mauro Carvalho Chehab [this message]
2011-11-20 14:56 ` [PATCH 4/8] [media] xc5000: Add support for get_if_frequency Mauro Carvalho Chehab
2011-11-20 14:56 ` [PATCH 5/8] [media] em28xx: initial support for HAUPPAUGE HVR-930C again Mauro Carvalho Chehab
2011-11-20 14:56 ` [PATCH 6/8] [media] em28xx: Fix CodingStyle issues introduced by changeset 82e7dbb Mauro Carvalho Chehab
2011-11-20 14:56 ` [PATCH 7/8] [media] em28xx: Add IR support for em2884 Mauro Carvalho Chehab
2011-11-20 14:56 ` [PATCH 8/8] [media] em28xx: Add IR support for HVR-930C Mauro Carvalho Chehab
2011-12-05 18:23 ` [PATCH 5/8] [media] em28xx: initial support for HAUPPAUGE HVR-930C again Devin Heitmueller
2011-12-05 18:35 ` Mauro Carvalho Chehab
2011-12-05 18:46 ` Devin Heitmueller
2011-12-05 20:01 ` Devin Heitmueller
2011-12-05 23:32 ` Eddi De Pieri
2011-12-05 23:47 ` Devin Heitmueller
2011-12-06 12:51 ` Mark Lord
2011-12-06 13:43 ` Mauro Carvalho Chehab
2011-12-06 13:56 ` Devin Heitmueller
2011-12-06 15:28 ` Mark Lord
2011-12-06 15:35 ` Devin Heitmueller
2011-12-06 15:44 ` Mauro Carvalho Chehab
2011-12-07 9:59 ` Mauro Carvalho Chehab
2011-11-20 20:27 ` [PATCH 1/8] [media] dvb: Allow select between DVB-C Annex A and Annex C Rémi Denis-Courmont
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321800978-27912-3-git-send-email-mchehab@redhat.com \
--to=mchehab@redhat.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.