summaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorviresh kumar <viresh.linux@gmail.com>2010-03-09 11:54:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-19 17:58:51 +0100
commite4bf5becccf4685754c4d8e4485bb2ff7d28147f (patch)
treee7a9791e41a86374d3bf061a305cb5e115283744 /arch/arm/common
parentARM: Arrange for COMMON_CLKDEV to select HAVE_CLK (diff)
downloadlinux-e4bf5becccf4685754c4d8e4485bb2ff7d28147f.tar.xz
linux-e4bf5becccf4685754c4d8e4485bb2ff7d28147f.zip
ARM: 5979/1: CLKDEV: return from clk_find as soon as we get maching clk
clk_find function looks for clock with matching dev_id and con_id. We should return from clk_find as soon as we get a clock with matching dev_id and con_id. This can be done by comparing variable "match" with 3. Acked-by: Uwe Kleine-Konig <u.kleine-koenig@pengutronix.de> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/clkdev.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/common/clkdev.c b/arch/arm/common/clkdev.c
index 6416d5b5020d..4f8390dd6cac 100644
--- a/arch/arm/common/clkdev.c
+++ b/arch/arm/common/clkdev.c
@@ -52,12 +52,13 @@ static struct clk *clk_find(const char *dev_id, const char *con_id)
continue;
match += 1;
}
- if (match == 0)
- continue;
if (match > best) {
clk = p->clk;
- best = match;
+ if (match != 3)
+ best = match;
+ else
+ break;
}
}
return clk;