---

yaml --- r: 261925 b: refs/heads/master c: 225ca45 h: refs/heads/master i: 261923: 88005da v: v3
git-mirror · Jun 24, 2011 · cb29694 · cb29694
1 parent 3a68214
commit cb29694
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 
 	/*