aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMarkus Rechberger <mrechberger@gmail.com>2006-02-26 22:07:34 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-26 22:07:34 -0500
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 fc589070ef69..00665d6ffc17 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[] = {
101 .input = {{ 101 .input = {{
102 .type = EM28XX_VMUX_TELEVISION, 102 .type = EM28XX_VMUX_TELEVISION,
103 .vmux = 2, 103 .vmux = 2,
104 .amux = 0, 104 .amux = 1,
105 },{ 105 },{
106 .type = EM28XX_VMUX_COMPOSITE1, 106 .type = EM28XX_VMUX_COMPOSITE1,
107 .vmux = 0, 107 .vmux = 0,
@@ -165,11 +165,11 @@ struct em28xx_board em28xx_boards[] = {
165 .input = {{ 165 .input = {{
166 .type = EM28XX_VMUX_COMPOSITE1, 166 .type = EM28XX_VMUX_COMPOSITE1,
167 .vmux = 2, 167 .vmux = 2,
168 .amux = 0, 168 .amux = 1,
169 },{ 169 },{
170 .type = EM28XX_VMUX_TELEVISION, 170 .type = EM28XX_VMUX_TELEVISION,
171 .vmux = 0, 171 .vmux = 0,
172 .amux = 1, 172 .amux = 0,
173 },{ 173 },{
174 .type = EM28XX_VMUX_SVIDEO, 174 .type = EM28XX_VMUX_SVIDEO,
175 .vmux = 9, 175 .vmux = 9,
@@ -185,12 +185,12 @@ struct em28xx_board em28xx_boards[] = {
185 .tuner_type = TUNER_XCEIVE_XC3028, 185 .tuner_type = TUNER_XCEIVE_XC3028,
186 .decoder = EM28XX_TVP5150, 186 .decoder = EM28XX_TVP5150,
187 .input = {{ 187 .input = {{
188 .type = EM28XX_VMUX_COMPOSITE1,
189 .vmux = 2,
190 .amux = 0,
191 },{
192 .type = EM28XX_VMUX_TELEVISION, 188 .type = EM28XX_VMUX_TELEVISION,
193 .vmux = 0, 189 .vmux = 0,
190 .amux = 0,
191 },{
192 .type = EM28XX_VMUX_COMPOSITE1,
193 .vmux = 2,
194 .amux = 1, 194 .amux = 1,
195 },{ 195 },{
196 .type = EM28XX_VMUX_SVIDEO, 196 .type = EM28XX_VMUX_SVIDEO,
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 671fc52b6a88..f56ae4852165 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)
222 222
223 /* enable vbi capturing */ 223 /* enable vbi capturing */
224 224
225 em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); 225/* em28xx_write_regs_req(dev,0x00,0x0e,"\xC0",1); audio register */
226 em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); 226/* em28xx_write_regs_req(dev,0x00,0x0f,"\x80",1); clk register */
227 em28xx_write_regs_req(dev,0x00,0x11,"\x51",1); 227 em28xx_write_regs_req(dev,0x00,0x11,"\x51",1);
228 228
229 em28xx_audio_usb_mute(dev, 1); 229 em28xx_audio_usb_mute(dev, 1);
@@ -313,11 +313,11 @@ static void video_mux(struct em28xx *dev, int index)
313 em28xx_audio_source(dev, ainput); 313 em28xx_audio_source(dev, ainput);
314 } else { 314 } else {
315 switch (dev->ctl_ainput) { 315 switch (dev->ctl_ainput) {
316 case 0: 316 case 0:
317 ainput = EM28XX_AUDIO_SRC_TUNER; 317 ainput = EM28XX_AUDIO_SRC_TUNER;
318 break; 318 break;
319 default: 319 default:
320 ainput = EM28XX_AUDIO_SRC_LINE; 320 ainput = EM28XX_AUDIO_SRC_LINE;
321 } 321 }
322 em28xx_audio_source(dev, ainput); 322 em28xx_audio_source(dev, ainput);
323 } 323 }