From 4fd9a48b2498c952262cb9f556e341a741967225 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Wed, 18 Jul 2012 11:52:22 +0800
Subject: [PATCH] --- yaml --- r: 316624 b: refs/heads/master c:
 9f1612d351a8e57d3d694e828641d3e4eeb224f8 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/clk/clkdev.c | 2 +-
 trunk/include/linux/clk.h  | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2ce5f3f0b0c4..7e8319197e78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c782c384d289a382baf4a1ab544f6f4b9e72405b
+refs/heads/master: 9f1612d351a8e57d3d694e828641d3e4eeb224f8
diff --git a/trunk/drivers/clk/clkdev.c b/trunk/drivers/clk/clkdev.c
index 20649b3c88fe..69085e02bd58 100644
--- a/trunk/drivers/clk/clkdev.c
+++ b/trunk/drivers/clk/clkdev.c
@@ -157,7 +157,7 @@ struct clk *clk_get(struct device *dev, const char *con_id)
 
 	if (dev) {
 		clk = of_clk_get_by_name(dev->of_node, con_id);
-		if (clk && __clk_get(clk))
+		if (!IS_ERR(clk) && __clk_get(clk))
 			return clk;
 	}
 
diff --git a/trunk/include/linux/clk.h b/trunk/include/linux/clk.h
index 8b70342e7e0b..071e24083dc8 100644
--- a/trunk/include/linux/clk.h
+++ b/trunk/include/linux/clk.h
@@ -12,6 +12,7 @@
 #ifndef __LINUX_CLK_H
 #define __LINUX_CLK_H
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/notifier.h>
 
@@ -320,12 +321,12 @@ struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec);
 #else
 static inline struct clk *of_clk_get(struct device_node *np, int index)
 {
-	return NULL;
+	return ERR_PTR(-ENOENT);
 }
 static inline struct clk *of_clk_get_by_name(struct device_node *np,
 					     const char *name)
 {
-	return NULL;
+	return ERR_PTR(-ENOENT);
 }
 #endif