summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMarkus Rechberger <mrechberger@gmail.com>2006-02-27 00:07:34 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-27 00:07:34 -0300
commit9475fb1c717ee5ce3df767b8e3b9439d341f043d (patch)
treebea4a1f4e3febaf330b603b3427e442e06ca893e /drivers/media/video/em28xx
parentcce91e36d74be635abb99aa1dc74951e11be8aea (diff)
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>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c14
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c14
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index fc589070ef6..00665d6ffc1 100644
--- 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 671fc52b6a8..f56ae485216 100644
--- 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);
}