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

Fixed amux hauppauge hvr900/terratec hybrid xs

Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index fc589070ef69bcc580d3219a9763adc79a233f93..00665d6ffc17c21ff04499a0f4f85b11c12ce48d 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -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,

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 671fc52b6a888a8aa726db031e8f7ab900725eec..f56ae4852165e1dba939527a7e70c870f7aaf663 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -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);
@@ -313,11 +313,11 @@ static void video_mux(struct em28xx *dev, int index)
                em28xx_audio_source(dev, ainput);
        } else {
                switch (dev->ctl_ainput) {
-               case 0:
-                       ainput = EM28XX_AUDIO_SRC_TUNER;
-                       break;
-               default:
-                       ainput = EM28XX_AUDIO_SRC_LINE;
+                       case 0:
+                               ainput = EM28XX_AUDIO_SRC_TUNER;
+                               break;
+                       default:
+                               ainput = EM28XX_AUDIO_SRC_LINE;
                }
                em28xx_audio_source(dev, ainput);
        }