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

Commit 9475fb1c authored by Markus Rechberger's avatar Markus Rechberger Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (3293): Fixed amux hauppauge hvr900/terratec hybrid xs 



Fixed amux hauppauge hvr900/terratec hybrid xs

Signed-off-by: default avatarMarkus Rechberger <mrechberger@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent cce91e36

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

+7 −7
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ struct em28xx_board em28xx_boards[] = { 
		.input          = {{

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = 2,

			.amux     = 0,

			.amux     = 1,

		},{

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = 0,
@@ -165,11 +165,11 @@ struct em28xx_board em28xx_boards[] = { 
		.input          = {{

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = 2,

			.amux     = 0,

			.amux     = 1,

		},{

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = 0,

			.amux     = 1,

			.amux     = 0,

		},{

			.type     = EM28XX_VMUX_SVIDEO,

			.vmux     = 9,
@@ -185,12 +185,12 @@ struct em28xx_board em28xx_boards[] = { 
		.tuner_type   = TUNER_XCEIVE_XC3028,

		.decoder      = EM28XX_TVP5150,

		.input          = {{

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = 2,

			.amux     = 0,

		},{

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = 0,

			.amux     = 0,

		},{

			.type     = EM28XX_VMUX_COMPOSITE1,

			.vmux     = 2,

			.amux     = 1,

		},{

			.type     = EM28XX_VMUX_SVIDEO,

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

+7 −7
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ static int em28xx_config(struct em28xx *dev) 


	/* enable vbi capturing */



	em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1);

	em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1);

/*	em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); audio register */

/*	em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); clk register */

	em28xx_write_regs_req(dev,0x00,0x11,"\x51",1);



	em28xx_audio_usb_mute(dev, 1);