From db9d3fa987090de79fe90269fd591c617da3cf9f Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 16 Feb 2010 13:23:15 +0200 Subject: [PATCH] --- yaml --- r: 182894 b: refs/heads/master c: e5e878c1c393de917391477bc7627d729f7568fb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320dac33.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cc3620778581..7eb766dd7ea5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbe21408b15f04da4f80fb89a27b7cb067d6103e +refs/heads/master: e5e878c1c393de917391477bc7627d729f7568fb diff --git a/trunk/sound/soc/codecs/tlv320dac33.c b/trunk/sound/soc/codecs/tlv320dac33.c index 1b35d0cf3364..dab7fd5be867 100644 --- a/trunk/sound/soc/codecs/tlv320dac33.c +++ b/trunk/sound/soc/codecs/tlv320dac33.c @@ -734,7 +734,10 @@ static int dac33_prepare_chip(struct snd_pcm_substream *substream) aictrl_a = dac33_read_reg_cache(codec, DAC33_SER_AUDIOIF_CTRL_A); aictrl_a &= ~(DAC33_NCYCL_MASK | DAC33_WLEN_MASK); + /* Read FIFO control A, and clear FIFO flush bit */ fifoctrl_a = dac33_read_reg_cache(codec, DAC33_FIFO_CTRL_A); + fifoctrl_a &= ~DAC33_FIFOFLUSH; + fifoctrl_a &= ~DAC33_WIDTH; switch (substream->runtime->format) { case SNDRV_PCM_FORMAT_S16_LE: