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

Commit 08eca13d authored by Markus Rechberger's avatar Markus Rechberger Committed by Linus Torvalds
Browse files

[PATCH] v4l: 838: modified settings for msi vox usb 2.0 



- Modified settings for MSI VOX USB 2.0

Signed-off-by: default avatarMarkus Rechberger <mrechberger@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fe2e36c8

Documentation/video4linux/CARDLIST.em28xx

+2 −2
Original line number Diff line number Diff line 
  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]

  1 -> Unknown EM2820/2840 video grabber        (em2820/em2840) [eb1a:2820]

  1 -> Unknown EM2820/2840 video grabber        (em2820/em2840)

  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]

  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]

  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200]

  5 -> MSI VOX USB 2.0                          (em2820/em2840)

  5 -> MSI VOX USB 2.0                          (em2820/em2840) [eb1a:2820]

  6 -> Terratec Cinergy 200 USB                 (em2800)

  7 -> Leadtek Winfast USB II                   (em2800)

  8 -> Kworld USB2800                           (em2800)

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

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ struct em2820_board em2820_boards[] = { 
		.name		= "MSI VOX USB 2.0",

		.vchannels	= 3,

		.norm		= VIDEO_MODE_PAL,

		.tuner_type	= TUNER_PHILIPS_PAL,

		.tuner_type	= TUNER_LG_PAL_NEW_TAPC,

		.tda9887_conf	= TDA9887_PRESENT|TDA9887_PORT1_ACTIVE|TDA9887_PORT2_ACTIVE,

		.has_tuner	= 1,

		.decoder        = EM2820_SAA7114,
@@ -233,7 +233,7 @@ const unsigned int em2820_bcount = ARRAY_SIZE(em2820_boards); 
/* table of devices that work with this driver */

struct usb_device_id em2820_id_table [] = {

	{ USB_DEVICE(0xeb1a, 0x2800), .driver_info = EM2800_BOARD_UNKNOWN },

	{ USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_UNKNOWN },

	{ USB_DEVICE(0xeb1a, 0x2820), .driver_info = EM2820_BOARD_MSI_VOX_USB_2 },

	{ USB_DEVICE(0x0ccd, 0x0036), .driver_info = EM2820_BOARD_TERRATEC_CINERGY_250 },

	{ USB_DEVICE(0x2304, 0x0208), .driver_info = EM2820_BOARD_PINNACLE_USB_2 },

	{ USB_DEVICE(0x2040, 0x4200), .driver_info = EM2820_BOARD_HAUPPAUGE_WINTV_USB_2 },