diff options
| author | Markus Rechberger <mrechberger@gmail.com> | 2006-02-01 20:02:10 +0100 |
|---|---|---|
| committer | Markus Rechberger <mrechberger@gmail.com> | 2006-02-01 20:02:10 +0100 |
| commit | 80c104143a6bdcbf4f9c7d9b6bad45aaeb580e52 (patch) | |
| tree | d7ac4dd52a6badae7fe24752c24b179808ad04a2 /linux/drivers/media/video/em28xx | |
| parent | 39f782974ab97d5d7a74b46e3bd566c48685dce8 (diff) | |
| download | mediapointer-dvb-s2-80c104143a6bdcbf4f9c7d9b6bad45aaeb580e52.tar.gz mediapointer-dvb-s2-80c104143a6bdcbf4f9c7d9b6bad45aaeb580e52.tar.bz2 | |
fixed amux hauppauge hvr900/terratec hybrid xs
From: Markus Rechberger <mrechberger@gmail.com>
fixed amux hauppauge hvr900/terratec hybrid xs
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c index 9830404e5..3e84ec7c0 100644 --- a/linux/drivers/media/video/em28xx/em28xx-cards.c +++ b/linux/drivers/media/video/em28xx/em28xx-cards.c @@ -102,7 +102,7 @@ struct em28xx_board em28xx_boards[] = { .input = {{ .type = EM28XX_VMUX_TELEVISION, .vmux = 2, - .amux = 0, + .amux = 1, },{ .type = EM28XX_VMUX_COMPOSITE1, .vmux = 0, @@ -166,11 +166,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, @@ -186,12 +186,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/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 30121f0ad..59c009505 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -255,8 +255,8 @@ static int em28xx_config(struct em28xx *dev) #if 1 /* 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); #endif @@ -383,11 +383,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); } |