From f6446abd0a6fc05d7ca01de4198e1b6e6f61aba7 Mon Sep 17 00:00:00 2001 From: Panagiotis Christeas Date: Sun, 15 Jan 2006 07:01:54 -0200 Subject: [PATCH] --- yaml --- r: 18687 b: refs/heads/master c: 7d83e8431ae531e907f09c277ab4ab4620092518 h: refs/heads/master i: 18685: f8a9e921d4576d16d5d8678653cdd427616b5f30 18683: 41a773f6086af9a1868345d476b69f7dc9dc68dc 18679: 68b2f4282ab8ae4bea95fbc3297e116b05ce6264 18671: a964f5734d8a75aa35120d6577fd6c175055f549 18655: 86efbff13d082bb11e86c7af01b3beb8aa720eeb 18623: 45c7aa2a11ea3629ea92a8e6ba4af78968db7925 18559: 816e24d10b741b9c775920c752d093da5288ac2e 18431: 6570ea6c0234c0e39c905781264dc1828eed7af4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx88/cx88-tvaudio.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff18cd921666..3fa7381d29e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9cff90ed9a23e9f73963fe73b71ef7e5de3e822 +refs/heads/master: 7d83e8431ae531e907f09c277ab4ab4620092518 diff --git a/trunk/drivers/media/video/cx88/cx88-tvaudio.c b/trunk/drivers/media/video/cx88/cx88-tvaudio.c index 24118e43e73a..da8d97ce0c4b 100644 --- a/trunk/drivers/media/video/cx88/cx88-tvaudio.c +++ b/trunk/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); }