From c327be133a7f3c549e1df0fc81fb2f481c9b3a54 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Fri, 23 Apr 2010 10:09:58 +0300 Subject: [PATCH] --- yaml --- r: 193411 b: refs/heads/master c: 55abb59c9a03d3aceda61e97b5ff19d9274fc611 h: refs/heads/master i: 193409: 32d07185f90266b426a2f805dd56833888b2f61c 193407: 129e48f6256ceb8be8c0ffdbc109034f5ec755c1 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320dac33.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 48d4f03da99a..3546f89ff0fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4d593280652025f797d432e90f49d49b9334689 +refs/heads/master: 55abb59c9a03d3aceda61e97b5ff19d9274fc611 diff --git a/trunk/sound/soc/codecs/tlv320dac33.c b/trunk/sound/soc/codecs/tlv320dac33.c index 520377bdb61c..b101cbd95740 100644 --- a/trunk/sound/soc/codecs/tlv320dac33.c +++ b/trunk/sound/soc/codecs/tlv320dac33.c @@ -889,6 +889,10 @@ static void dac33_calculate_times(struct snd_pcm_substream *substream) struct tlv320dac33_priv *dac33 = snd_soc_codec_get_drvdata(codec); unsigned int nsample_limit; + /* In bypass mode we don't need to calculate */ + if (!dac33->fifo_mode) + return; + /* Number of samples (16bit, stereo) in one period */ dac33->nsample_min = snd_pcm_lib_period_bytes(substream) / 4; @@ -1244,6 +1248,7 @@ static int __devinit dac33_i2c_probe(struct i2c_client *client, dac33->keep_bclk = pdata->keep_bclk; dac33->irq = client->irq; dac33->nsample = NSAMPLE_MAX; + dac33->nsample_max = NSAMPLE_MAX; /* Disable FIFO use by default */ dac33->fifo_mode = DAC33_FIFO_BYPASS;