diff options
author | Markus Rechberger <mrechberger@gmail.com> | 2006-02-26 22:07:34 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-26 22:07:34 -0500 |
commit | 9475fb1c717ee5ce3df767b8e3b9439d341f043d (patch) | |
tree | bea4a1f4e3febaf330b603b3427e442e06ca893e /drivers/media/video/em28xx/em28xx-video.c | |
parent | cce91e36d74be635abb99aa1dc74951e11be8aea (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/em28xx-video.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 14 |
1 files changed, 7 insertions, 7 deletions
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 | } |