From: Stephen Boyd Date: Wed, 31 Jul 2019 19:35:10 +0000 (-0700) Subject: clk: lochnagar: Don't reference clk_init_data after registration X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~2007^2~3^2~14 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d6d251f9bb74435a3e4ade641306f90f75645c5c;p=mirror_ubuntu-focal-kernel.git 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 Cc: Richard Fitzgerald Signed-off-by: Stephen Boyd Link: https://lkml.kernel.org/r/20190731193517.237136-3-sboyd@kernel.org Acked-by: Charles Keepax --- 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;