diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 08:39:30 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-16 08:39:30 -0200 |
| commit | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (patch) | |
| tree | d6e3f7e8ac8a6c567d800fb30e237eb788ac3edf /drivers/media/video/cx88/cx88-tvaudio.c | |
| parent | 4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d (diff) | |
| parent | 21e2379b9ef705fcb3ba3be738decd3397fc30b7 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/cx88/cx88-tvaudio.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-tvaudio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index 24118e43e73..da8d97ce0c4 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c @@ -60,6 +60,11 @@ static unsigned int audio_debug = 0; module_param(audio_debug, int, 0644); MODULE_PARM_DESC(audio_debug, "enable debug messages [audio]"); +static unsigned int always_analog = 0; +module_param(always_analog,int,0644); +MODULE_PARM_DESC(always_analog,"force analog audio out"); + + #define dprintk(fmt, arg...) if (audio_debug) \ printk(KERN_DEBUG "%s/0: " fmt, core->name , ## arg) @@ -155,7 +160,8 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl) cx_write(AUD_I2SOUTPUTCNTL, 1); cx_write(AUD_I2SCNTL, 0); /* cx_write(AUD_APB_IN_RATE_ADJ, 0); */ - } else { + } + if ((always_analog) || (!cx88_boards[core->board].blackbird)) { ctl |= EN_DAC_ENABLE; cx_write(AUD_CTL, ctl); } |