From 3918d5264e16896d21059171568e3d8131858190 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Sat, 2 Jan 2010 13:13:42 +0000 Subject: [PATCH] --- yaml --- r: 182811 b: refs/heads/master c: 5baf831541c61546c00e8d6f294cb10ed5d25e7d h: refs/heads/master i: 182809: ea41f7e0cb6e35758640e86c2ca2556ee85c9caf 182807: 589b29775f7ec60d170714c3713bae0136f54e4c v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/tlv320aic3x.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ec880324d3b0..398bcd27ebd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a126fd5691e6cd680758b72e6ea288bb83b9deb6 +refs/heads/master: 5baf831541c61546c00e8d6f294cb10ed5d25e7d diff --git a/trunk/sound/soc/codecs/tlv320aic3x.c b/trunk/sound/soc/codecs/tlv320aic3x.c index 5a8f53ce2250..e4b946a19ea3 100644 --- a/trunk/sound/soc/codecs/tlv320aic3x.c +++ b/trunk/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; } }