summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2019-07-31 22:35:10 +0300
committerStephen Boyd <sboyd@kernel.org>2019-08-16 20:20:07 +0300
commitd6d251f9bb74435a3e4ade641306f90f75645c5c (patch)
tree8e1a383d56b726af6ceeb481add6678bbaa86d9f
parentcf9ec1fc6d7cceb73e7f1efd079d2eae173fdf57 (diff)
downloadlinux-d6d251f9bb74435a3e4ade641306f90f75645c5c.tar.xz
clk: lochnagar: Don't reference clk_init_data after registration
A future patch is going to change semantics of clk_register() so that clk_hw::init is guaranteed to be NULL after a clk is registered. Avoid referencing this member here so that we don't run into NULL pointer exceptions. Cc: Charles Keepax <ckeepax@opensource.cirrus.com> Cc: Richard Fitzgerald <rf@opensource.cirrus.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org> Link: https://lkml.kernel.org/r/20190731193517.237136-3-sboyd@kernel.org Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
-rw-r--r--drivers/clk/clk-lochnagar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-lochnagar.c b/drivers/clk/clk-lochnagar.c
index fa8c91758b1d..565bcd0cdde9 100644
--- a/drivers/clk/clk-lochnagar.c
+++ b/drivers/clk/clk-lochnagar.c
@@ -198,7 +198,7 @@ static u8 lochnagar_clk_get_parent(struct clk_hw *hw)
if (ret < 0) {
dev_dbg(priv->dev, "Failed to read parent of %s: %d\n",
lclk->name, ret);
- return hw->init->num_parents;
+ return clk_hw_get_num_parents(hw);
}
val &= lclk->src_mask;