From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 2 Jan 2010 13:13:42 +0000 (+0000)
Subject: ASoC: Fix variable shadowing warning in TLV320AIC3x
X-Git-Tag: v2.6.35-rc6~9^2~7^2~225
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5baf831541c61546c00e8d6f294cb10ed5d25e7d;p=~emulex%2Finfiniband.git

ASoC: Fix variable shadowing warning in TLV320AIC3x

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
---

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5a8f53ce225..e4b946a19ea 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;
 			}
 		}