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 <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
