Commit 4e145349 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] em28xx: Fix some Terratec entries (H5 and XS) 



As reported by  Andreas Oberritter <obi@linuxtv.org>, changeset
33ba28ee 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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2440f7af

Documentation/video4linux/CARDLIST.em28xx

+3 −3
Original line number Diff line number Diff line
@@ -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)

drivers/media/video/em28xx/em28xx-cards.c

+3 −3
Original line number Diff line number Diff line
@@ -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),