Skip to content

Commit

Permalink
ASoC: Fix variable shadowing warning in TLV320AIC3x
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown committed Jan 4, 2010
1 parent a126fd5 commit 5baf831
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sound/soc/codecs/tlv320aic3x.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,20 +849,20 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
* The term had to be converted to get
* rid of the division by 10000; d = 0 here
*/
int clk = (1000 * j * r) / p;
int tmp_clk = (1000 * j * r) / p;

/* Check whether this values get closer than
* the best ones we had before
*/
if (abs(codec_clk - clk) <
if (abs(codec_clk - tmp_clk) <
abs(codec_clk - last_clk)) {
pll_j = j; pll_d = 0;
pll_r = r; pll_p = p;
last_clk = clk;
last_clk = tmp_clk;
}

/* Early exit for exact matches */
if (clk == codec_clk)
if (tmp_clk == codec_clk)
goto found;
}
}
Expand Down

0 comments on commit 5baf831

Please sign in to comment.