---

yaml --- r: 146824 b: refs/heads/master c: f3f8290 h: refs/heads/master v: v3
git-mirror · May 12, 2009 · 04f55f7 · 04f55f7
1 parent 5a16fd6
commit 04f55f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dae89572cbcd5f676ea52a9448d9639d97a53d6
+refs/heads/master: f3f8290cb3fa4aa627321530bb85d5f35e487433
diff --git a/trunk/arch/sh/kernel/cpu/clock.c b/trunk/arch/sh/kernel/cpu/clock.c
@@ -399,7 +399,7 @@ struct clk *clk_get(struct device *dev, const char *id)
 	int idno;
 
 	clk = clk_get_sys(dev_id, id);
-	if (clk)
+	if (clk && !IS_ERR(clk))
 		return clk;
 
 	if (dev == NULL || dev->bus != &platform_bus_type)