From cb296944a3078f1f2f4ad15d6d60e847b3c62429 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 24 Jun 2011 17:35:40 +0900
Subject: [PATCH] --- yaml --- r: 261925 b: refs/heads/master c:
 225ca45c3c64964163ea1fa85e2081af85956eed h: refs/heads/master i:   261923:
 88005daae65e5974baa79abe67a25f5056efe91c v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/sh/clk/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bdc8b597f049..3712ef6e9673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: facbdce9a2a68098eabb06671c3b9d9b992bad60
+refs/heads/master: 225ca45c3c64964163ea1fa85e2081af85956eed
diff --git a/trunk/drivers/sh/clk/core.c b/trunk/drivers/sh/clk/core.c
index ebeaa9e9f068..229ad0991f26 100644
--- a/trunk/drivers/sh/clk/core.c
+++ b/trunk/drivers/sh/clk/core.c
@@ -396,7 +396,7 @@ int clk_register(struct clk *clk)
 {
 	int ret;
 
-	if (clk == NULL || IS_ERR(clk))
+	if (IS_ERR_OR_NULL(clk))
 		return -EINVAL;
 
 	/*