From cbf6e626c475660e737bde5381cf38e335687b6f Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 1 May 2015 21:50:46 +0200 Subject: [PATCH] clk: prevent orphan access on non-devicetree platforms too The orphan-check in __of_clk_get_from_provider only prevents orphan-access on devicetree platforms. To bring non-dt platforms to the same level of functionality let clk_get_sys (called from clk_get for non-dt platforms) also check for orphans and return -EPROBE_DEFER in that case. Signed-off-by: Heiko Stuebner --- drivers/clk/clk.c | 2 +- drivers/clk/clk.h | 5 +++++ drivers/clk/clkdev.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 36d1a01..167d0bf 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2220,7 +2220,7 @@ static inline void clk_debug_unregister(struct clk_core *core) } #endif -static bool clk_is_orphan(const struct clk *clk) +bool clk_is_orphan(const struct clk *clk) { if (!clk) return false; diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h index 00b35a1..b8a6061 100644 --- a/drivers/clk/clk.h +++ b/drivers/clk/clk.h @@ -20,6 +20,7 @@ struct clk *__of_clk_get_from_provider(struct of_phandle_args *clkspec, struct clk *__clk_create_clk(struct clk_hw *hw, const char *dev_id, const char *con_id); void __clk_free_clk(struct clk *clk); +bool clk_is_orphan(const struct clk *clk); #else /* All these casts to avoid ifdefs in clkdev... */ static inline struct clk * @@ -32,5 +33,9 @@ static struct clk_hw *__clk_get_hw(struct clk *clk) { return (struct clk_hw *)clk; } +static inline bool clk_is_orphan(const struct clk *clk) +{ + return false; +} #endif diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 1fcb6ef..ad96775 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -177,6 +177,11 @@ struct clk *clk_get_sys(const char *dev_id, const char *con_id) if (!cl) goto out; + if (clk_is_orphan(cl->clk)) { + clk = ERR_PTR(-EPROBE_DEFER); + goto out; + } + clk = __clk_create_clk(__clk_get_hw(cl->clk), dev_id, con_id); if (IS_ERR(clk)) goto out; -- 2.1.4