[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1423163365-15267-1-git-send-email-wsa@the-dreams.de>
Date: Thu, 5 Feb 2015 20:09:22 +0100
From: Wolfram Sang <wsa@...-dreams.de>
To: linux-kernel@...r.kernel.org
Cc: Wolfram Sang <wsa@...-dreams.de>,
Russell King <linux@....linux.org.uk>
Subject: [PATCH] clk: return proper ERR_PTR for clk_get when !HAVE_CLK
clk_get functions return an ERR_PTR and not NULL in the error case. Make
that consistent for the dummy functions when HAVE_CLK is not enabled.
Otherwise unexpected codepaths might be trying to use a NULL pointer.
Signed-off-by: Wolfram Sang <wsa@...-dreams.de>
---
include/linux/clk.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/clk.h b/include/linux/clk.h
index c7f258a81761..37a286b69943 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -340,12 +340,12 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id);
static inline struct clk *clk_get(struct device *dev, const char *id)
{
- return NULL;
+ return ERR_PTR(-ENOENT);
}
static inline struct clk *devm_clk_get(struct device *dev, const char *id)
{
- return NULL;
+ return ERR_PTR(-ENOENT);
}
static inline void clk_put(struct clk *clk) {}
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists