aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-tvaudio.c
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l@cerqueira.org>2006-08-17 17:40:28 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 11:30:32 -0400
commite738e35d1e9ae15b597c713e0b74e9a535020c0d (patch)
treeb5bf56f45307ae39412add8a1c9b028b86763b6f /drivers/media/video/cx88/cx88-tvaudio.c
parent4e318bef68e819f001a3c8af65401891893d3d54 (diff)
V4L/DVB (4504): Enable audio DMA restart on channel change even when cx88-alsa is compiled
cx88-alsa can be compiled in (in distro built kernels, for example), but not used. In those cases, the audio DMA restart is needed for proper sound on NICAM channels. This patch enables the DMA restart even with ALSA, but the functions now check if cx88-alsa is really active. Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-tvaudio.c')
-rw-r--r--drivers/media/video/cx88/cx88-tvaudio.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index cbd85feec922..741e7c5e69ec 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -137,14 +137,10 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
137{ 137{
138 u32 volume; 138 u32 volume;
139 139
140#ifndef CONFIG_VIDEO_CX88_ALSA
141 /* restart dma; This avoids buzz in NICAM and is good in others */ 140 /* restart dma; This avoids buzz in NICAM and is good in others */
142 cx88_stop_audio_dma(core); 141 cx88_stop_audio_dma(core);
143#endif
144 cx_write(AUD_RATE_THRES_DMD, 0x000000C0); 142 cx_write(AUD_RATE_THRES_DMD, 0x000000C0);
145#ifndef CONFIG_VIDEO_CX88_ALSA
146 cx88_start_audio_dma(core); 143 cx88_start_audio_dma(core);
147#endif
148 144
149 if (cx88_boards[core->board].blackbird) { 145 if (cx88_boards[core->board].blackbird) {
150 /* sets sound input from external adc */ 146 /* sets sound input from external adc */