diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-02 13:13:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-04 21:49:53 +0000 |
| commit | 5baf831541c61546c00e8d6f294cb10ed5d25e7d (patch) | |
| tree | e2bf2ca4fdfc25470d2401858e3a9cd455f90f27 | |
| parent | a126fd5691e6cd680758b72e6ea288bb83b9deb6 (diff) | |
| download | blackbird-op-linux-5baf831541c61546c00e8d6f294cb10ed5d25e7d.tar.gz blackbird-op-linux-5baf831541c61546c00e8d6f294cb10ed5d25e7d.zip | |
ASoC: Fix variable shadowing warning in TLV320AIC3x
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 5a8f53ce2250..e4b946a19ea3 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -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; } } |
