2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 20649b3c88fe..69085e02bd58 100644
--- a/drivers/clk/clkdev.c
+++ b/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/include/linux/clk.h b/include/linux/clk.h
index 8b70342e7e0b..071e24083dc8 100644
--- a/include/linux/clk.h
+++ b/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