diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-02 08:13:42 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-04 16:49:53 -0500 |
commit | 5baf831541c61546c00e8d6f294cb10ed5d25e7d (patch) | |
tree | e2bf2ca4fdfc25470d2401858e3a9cd455f90f27 /sound/soc/codecs/tlv320aic3x.c | |
parent | a126fd5691e6cd680758b72e6ea288bb83b9deb6 (diff) |
ASoC: Fix variable shadowing warning in TLV320AIC3x
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
-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, | |||
849 | * The term had to be converted to get | 849 | * The term had to be converted to get |
850 | * rid of the division by 10000; d = 0 here | 850 | * rid of the division by 10000; d = 0 here |
851 | */ | 851 | */ |
852 | int clk = (1000 * j * r) / p; | 852 | int tmp_clk = (1000 * j * r) / p; |
853 | 853 | ||
854 | /* Check whether this values get closer than | 854 | /* Check whether this values get closer than |
855 | * the best ones we had before | 855 | * the best ones we had before |
856 | */ | 856 | */ |
857 | if (abs(codec_clk - clk) < | 857 | if (abs(codec_clk - tmp_clk) < |
858 | abs(codec_clk - last_clk)) { | 858 | abs(codec_clk - last_clk)) { |
859 | pll_j = j; pll_d = 0; | 859 | pll_j = j; pll_d = 0; |
860 | pll_r = r; pll_p = p; | 860 | pll_r = r; pll_p = p; |
861 | last_clk = clk; | 861 | last_clk = tmp_clk; |
862 | } | 862 | } |
863 | 863 | ||
864 | /* Early exit for exact matches */ | 864 | /* Early exit for exact matches */ |
865 | if (clk == codec_clk) | 865 | if (tmp_clk == codec_clk) |
866 | goto found; | 866 | goto found; |
867 | } | 867 | } |
868 | } | 868 | } |