Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10ac6603 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (8541): em28xx: HVR-950 entry is duplicated. 



Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this
issue.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent d3603341

Documentation/video4linux/CARDLIST.em28xx

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 13 -> Terratec Prodigy XS                      (em2880)        [0ccd:0047]

 14 -> Pixelview Prolink PlayTV USB 2.0         (em2820/em2840)

 15 -> V-Gear PocketTV                          (em2800)

 16 -> Hauppauge WinTV HVR 950                  (em2880)        [2040:6513,2040:6517,2040:651b,2040:651f]

 16 -> Hauppauge WinTV HVR 950                  (em2883)        [2040:6513,2040:6517,2040:651b,2040:651f]

 17 -> Pinnacle PCTV HD Pro Stick               (em2880)        [2304:0227]

 18 -> Hauppauge WinTV HVR 900 (R2)             (em2880)        [2040:6502]

 19 -> PointNix Intra-Oral Camera               (em2860)
@@ -56,5 +56,4 @@ 
 55 -> Terratec Hybrid XS (em2882)              (em2882)        [0ccd:005e]

 56 -> Pinnacle Hybrid Pro (2)                  (em2882)        [2304:0226]

 57 -> Kworld PlusTV HD Hybrid 330              (em2883)        [eb1a:a316]

 58 -> Hauppauge WinTV HVR 950                  (em2883)

 59 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]
 
 58 -> Compro VideoMate ForYou/Stereo           (em2820/em2840) [185b:2041]

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

+8 −29
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ struct em28xx_board em28xx_boards[] = { 
			.amux     = 1,

		} },

	},

	[EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950] = {

	[EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950] = {

		.name           = "Hauppauge WinTV HVR 950",

		.vchannels      = 3,

		.tda9887_conf   = TDA9887_PRESENT,
@@ -1093,26 +1093,6 @@ struct em28xx_board em28xx_boards[] = { 
			.amux     = 1,

		} },

	},

	[EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950] = {

		.name         = "Hauppauge WinTV HVR 950",

		.valid        = EM28XX_BOARD_NOT_VALIDATED,

		.vchannels    = 3,

		.tuner_type   = TUNER_XC2028,

		.decoder      = EM28XX_TVP5150,

		.input          = { {

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = TVP5150_COMPOSITE0,

			.amux     = 0,

		}, {

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = TVP5150_COMPOSITE1,

			.amux     = 1,

		}, {

			.type     = EM28XX_VMUX_SVIDEO,

			.vmux     = TVP5150_SVIDEO,

			.amux     = 1,

		} },

	},

	[EM2883_BOARD_KWORLD_HYBRID_A316] = {

		.name         = "Kworld PlusTV HD Hybrid 330",

		.valid        = EM28XX_BOARD_NOT_VALIDATED,
@@ -1222,13 +1202,13 @@ struct usb_device_id em28xx_id_table [] = { 
	{ USB_DEVICE(0x2040, 0x6502),

			.driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2 },

	{ USB_DEVICE(0x2040, 0x6513), /* HCW HVR-980 */

			.driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },

			.driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },

	{ USB_DEVICE(0x2040, 0x6517), /* HP  HVR-950 */

			.driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },

			.driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },

	{ USB_DEVICE(0x2040, 0x651b), /* RP  HVR-950 */

			.driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },

			.driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },

	{ USB_DEVICE(0x2040, 0x651f), /* HCW HVR-850 */

			.driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },

			.driver_info = EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950 },

	{ USB_DEVICE(0x0438, 0xb002),

			.driver_info = EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600 },

	{ USB_DEVICE(0x2001, 0xf112),
@@ -1401,10 +1381,9 @@ void em28xx_pre_card_setup(struct em28xx *dev) 
	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

	case EM2860_BOARD_TERRATEC_HYBRID_XS:

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:

	case EM2882_BOARD_PINNACLE_HYBRID_PRO:

	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2883_BOARD_KWORLD_HYBRID_A316:

	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:

		em28xx_write_regs(dev, EM28XX_R0F_XCLK,    "\x27", 1);
@@ -1595,7 +1574,7 @@ static void em28xx_setup_xc3028(struct em28xx *dev, struct xc2028_ctrl *ctl) 
		/* djh - Not sure which demod we need here */

		ctl->demod = XC3028_FE_DEFAULT;

		break;

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:

	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:

		/* FIXME: Better to specify the needed IF */
@@ -1778,7 +1757,7 @@ void em28xx_card_setup(struct em28xx *dev) 
	case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2:

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:

	{

		struct tveeprom tv;

#ifdef CONFIG_MODULES

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

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static int dvb_init(struct em28xx *dev) 
	em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);

	/* init frontend */

	switch (dev->model) {

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:

	case EM2880_BOARD_PINNACLE_PCTV_HD_PRO:

	case EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600:

		dvb->frontend = dvb_attach(lgdt330x_attach,

drivers/media/video/em28xx/em28xx.h

+2 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define EM2880_BOARD_TERRATEC_PRODIGY_XS	13

#define EM2820_BOARD_PROLINK_PLAYTV_USB2	14

#define EM2800_BOARD_VGEAR_POCKETTV             15

#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950	16

#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950	16

#define EM2880_BOARD_PINNACLE_PCTV_HD_PRO	17

#define EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2	18

#define EM2860_BOARD_POINTNIX_INTRAORAL_CAMERA  19
@@ -96,8 +96,7 @@ 
#define EM2882_BOARD_TERRATEC_HYBRID_XS		  55

#define EM2882_BOARD_PINNACLE_HYBRID_PRO	  56

#define EM2883_BOARD_KWORLD_HYBRID_A316		  57

#define EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950	  58

#define EM2820_BOARD_COMPRO_VIDEO_MATE		  59

#define EM2820_BOARD_COMPRO_VIDEO_MATE		  58



/* Limits minimum and default number of buffers */

#define EM28XX_MIN_BUF 4