diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2006-01-05 03:31:42 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2006-01-05 03:31:42 +0000 |
| commit | b951721f0c713f7043f0346e16c9b0d5190633f3 (patch) | |
| tree | b5f5254266a6353199d07e2eb95544d130ad6c08 /linux/drivers/media/video/cx88/cx88-tvaudio.c | |
| parent | f7f8cd7c769882afe66875f83b23602bb23efed4 (diff) | |
| download | mediapointer-dvb-s2-b951721f0c713f7043f0346e16c9b0d5190633f3.tar.gz mediapointer-dvb-s2-b951721f0c713f7043f0346e16c9b0d5190633f3.tar.bz2 | |
Workaround to deal with the cx88 DMA code conflicts
From: Ricardo Cerqueira <v4l@cerqueira.org>
Existing audio DMA uses conflict with cx88-alsa. This workaround disables
that code if cx88-alsa is being compiled
Signed-off-by:
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-tvaudio.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index 478723ca5..1c169059b 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -1,5 +1,5 @@ /* - $Id: cx88-tvaudio.c,v 1.51 2005/12/05 02:31:46 mchehab Exp $ + $Id: cx88-tvaudio.c,v 1.52 2006/01/05 03:31:42 rmcc Exp $ cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver @@ -136,12 +136,12 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) { u32 volume; -#if 1 +#ifndef USING_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); -#if 1 +#ifndef USING_CX88_ALSA cx88_start_audio_dma(core); #endif |