diff options
author | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-06-17 23:21:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 01:05:12 -0400 |
commit | b63535f4058eca81b64485c885610008784d2bb0 (patch) | |
tree | c5cfdaeda152cb96fa9749a7ff5b40b48168b344 | |
parent | 0f4b56807b443927600112c1351a181ce664929c (diff) |
V4L/DVB (4132): Don't kill cx88 DMA sound on channel change
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 256ae8515d2b..c43e59047930 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
@@ -137,12 +137,12 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) | |||
137 | { | 137 | { |
138 | u32 volume; | 138 | u32 volume; |
139 | 139 | ||
140 | #ifndef USING_CX88_ALSA | 140 | #ifndef CONFIG_VIDEO_CX88_ALSA |
141 | /* restart dma; This avoids buzz in NICAM and is good in others */ | 141 | /* restart dma; This avoids buzz in NICAM and is good in others */ |
142 | cx88_stop_audio_dma(core); | 142 | cx88_stop_audio_dma(core); |
143 | #endif | 143 | #endif |
144 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); | 144 | cx_write(AUD_RATE_THRES_DMD, 0x000000C0); |
145 | #ifndef USING_CX88_ALSA | 145 | #ifndef CONFIG_VIDEO_CX88_ALSA |
146 | cx88_start_audio_dma(core); | 146 | cx88_start_audio_dma(core); |
147 | #endif | 147 | #endif |
148 | 148 | ||