---

yaml --- r: 319892 b: refs/heads/master c: e47c6a3 h: refs/heads/master v: v3
git-mirror · Jul 31, 2012 · 044fb7e · 044fb7e
1 parent 4bd04d8
commit 044fb7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7041717e7c6ca33310d0c7333d9f7cebc65b2534
+refs/heads/master: e47c6a3408ea6bcfc5204f23d5a5b209de6e68b9
diff --git a/trunk/drivers/clk/clk.c b/trunk/drivers/clk/clk.c
@@ -465,6 +465,9 @@ static void __clk_disable(struct clk *clk)
 	if (!clk)
 		return;
 
+	if (WARN_ON(IS_ERR(clk)))
+		return;
+
 	if (WARN_ON(clk->enable_count == 0))
 		return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -465,6 +465,9 @@ static void __clk_disable(struct clk *clk) @@
     	if (!clk)
     		return;
+    	if (WARN_ON(IS_ERR(clk)))
+    		return;
     	if (WARN_ON(clk->enable_count == 0))
     		return;
@@ Expand Down @@