diff --git a/[refs] b/[refs]
index f5743d34be59..9d4772d27dba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0deac0bf66110fe70507c5dcec661c9e85fa07ca
+refs/heads/master: e4bf5becccf4685754c4d8e4485bb2ff7d28147f
diff --git a/trunk/arch/arm/common/clkdev.c b/trunk/arch/arm/common/clkdev.c
index 6416d5b5020d..4f8390dd6cac 100644
--- a/trunk/arch/arm/common/clkdev.c
+++ b/trunk/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;