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;