Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: actions: 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: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20190731193517.237136-2-sboyd@kernel.org
[sboyd@kernel.org: Move name to after checking for error or NULL hw]
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

+3 -2
+3 -2
drivers/clk/actions/owl-common.c
··· 68 68 struct clk_hw *hw; 69 69 70 70 for (i = 0; i < hw_clks->num; i++) { 71 + const char *name; 71 72 72 73 hw = hw_clks->hws[i]; 73 - 74 74 if (IS_ERR_OR_NULL(hw)) 75 75 continue; 76 76 77 + name = hw->init->name; 77 78 ret = devm_clk_hw_register(dev, hw); 78 79 if (ret) { 79 80 dev_err(dev, "Couldn't register clock %d - %s\n", 80 - i, hw->init->name); 81 + i, name); 81 82 return ret; 82 83 } 83 84 }