From 044fb7ef5316ff653a48f5599ebf4f06687d24e0 Mon Sep 17 00:00:00 2001
From: Fengguang Wu <fengguang.wu@intel.com>
Date: Mon, 30 Jul 2012 14:39:54 -0700
Subject: [PATCH] --- yaml --- r: 319892 b: refs/heads/master c:
 e47c6a3408ea6bcfc5204f23d5a5b209de6e68b9 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/clk/clk.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd00af834e56..da175a622fe7 100644
--- 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
index c87fdd710560..efdfd009c270 100644
--- 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;