diff --git a/[refs] b/[refs]
index f01b04508272..0247af29a565 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03c5ecd13cfe308a521e40e6dec6059314f3341b
+refs/heads/master: f5ca6d4cbd49dbb6e179a71fa610eb321a3e9951
diff --git a/trunk/drivers/sh/clk.c b/trunk/drivers/sh/clk.c
index c90a3e1e1085..5d84adac9ec4 100644
--- a/trunk/drivers/sh/clk.c
+++ b/trunk/drivers/sh/clk.c
@@ -160,12 +160,9 @@ void propagate_rate(struct clk *tclk)
 
 static void __clk_disable(struct clk *clk)
 {
-	if (clk->usecount == 0) {
-		printk(KERN_ERR "Trying disable clock %s with 0 usecount\n",
-		       clk->name);
-		WARN_ON(1);
+	if (WARN(!clk->usecount, "Trying to disable clock %s with 0 usecount\n",
+		 clk->name))
 		return;
-	}
 
 	if (!(--clk->usecount)) {
 		if (likely(clk->ops && clk->ops->disable))