aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2015-02-12 08:58:28 -0500
committerMichael Turquette <mturquette@linaro.org>2015-02-18 12:40:01 -0500
commit9e0ad7d28ace92319f5aa0e314ac9f11e18b4250 (patch)
treea0cbc1685f5e35f226c2e2b247c1239c665de2ac
parent69b59cb8173a0c7369580655abebee4b2137d201 (diff)
clk: Don't dereference parent clock if is NULL
The clock passed as an argument to clk_mux_determine_rate_flags() has the CLK_SET_RATE_PARENT flag set but it has no parent, then a NULL pointer will tried to be dereferenced. This shouldn't happen since setting that flag for a clock with no parent is a bug but the core should be robust to handle that case. Fixes: 035a61c314eb3 ("clk: Make clk API return per-user struct clk instances") Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Michael Turquette <mturquette@linaro.org>
-rw-r--r--drivers/clk/clk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 5469d7714f5d..f3a7a4425242 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -800,8 +800,8 @@ clk_mux_determine_rate_flags(struct clk_hw *hw, unsigned long rate,
800 if (core->flags & CLK_SET_RATE_NO_REPARENT) { 800 if (core->flags & CLK_SET_RATE_NO_REPARENT) {
801 parent = core->parent; 801 parent = core->parent;
802 if (core->flags & CLK_SET_RATE_PARENT) 802 if (core->flags & CLK_SET_RATE_PARENT)
803 best = __clk_determine_rate(parent->hw, rate, 803 best = __clk_determine_rate(parent ? parent->hw : NULL,
804 min_rate, max_rate); 804 rate, min_rate, max_rate);
805 else if (parent) 805 else if (parent)
806 best = clk_core_get_rate_nolock(parent); 806 best = clk_core_get_rate_nolock(parent);
807 else 807 else