diff options
| author | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-06-18 04:21:49 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-06-18 04:21:49 +0100 |
| commit | c1752e9f9cc41b972abd82c12984361036b740dd (patch) | |
| tree | 7e1dd3b397c7d8f5790599109c94550752b019b6 /linux/drivers/media/video | |
| parent | b219a25490dd768061f3fa29dd0d13cab1a37740 (diff) | |
| download | mediapointer-dvb-s2-c1752e9f9cc41b972abd82c12984361036b740dd.tar.gz mediapointer-dvb-s2-c1752e9f9cc41b972abd82c12984361036b740dd.tar.bz2 | |
Don't kill cx88 DMA sound on channel change
From: Ricardo Cerqueira <v4l@cerqueira.org>
There's a call at cx88-tvaudio to reset DMA sound on channel change; that
call was killing cx88-alsa whenever the channel was changed, resulting
in no sound. Remove those calls if cx88-alsa is selected to be compiled.
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index efd8d231c..7920e2d22 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -140,12 +140,12 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) { u32 volume; -#ifndef USING_CX88_ALSA +#ifndef CONFIG_VIDEO_CX88_ALSA /* restart dma; This avoids buzz in NICAM and is good in others */ cx88_stop_audio_dma(core); #endif cx_write(AUD_RATE_THRES_DMD, 0x000000C0); -#ifndef USING_CX88_ALSA +#ifndef CONFIG_VIDEO_CX88_ALSA cx88_start_audio_dma(core); #endif |