summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l@cerqueira.org>2006-06-18 00:21:49 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 02:05:12 -0300
commitb63535f4058eca81b64485c885610008784d2bb0 (patch)
treec5cfdaeda152cb96fa9749a7ff5b40b48168b344 /drivers
parent0f4b56807b443927600112c1351a181ce664929c (diff)
downloadop-kernel-dev-b63535f4058eca81b64485c885610008784d2bb0.zip
op-kernel-dev-b63535f4058eca81b64485c885610008784d2bb0.tar.gz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx88/cx88-tvaudio.c4
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 256ae85..c43e590 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)
{
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
OpenPOWER on IntegriCloud