leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: actions: Don't reference clk_init_data after registration

Browse Source 
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>
This commit is contained in:
Stephen Boyd 2019-07-31 12:35:09 -07:00
parent 5f9e832c13
commit cf9ec1fc6d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/clk/actions/owl-common.c
View File

@ -68,16 +68,17 @@ int owl_clk_probe(struct device *dev, struct clk_hw_onecell_data *hw_clks)
struct clk_hw *hw; struct clk_hw *hw;
for (i = 0; i < hw_clks->num; i++) { for (i = 0; i < hw_clks->num; i++) {
const char *name;
hw = hw_clks->hws[i]; hw = hw_clks->hws[i];
if (IS_ERR_OR_NULL(hw)) if (IS_ERR_OR_NULL(hw))
continue; continue;
name = hw->init->name;
ret = devm_clk_hw_register(dev, hw); ret = devm_clk_hw_register(dev, hw);
if (ret) { if (ret) {
dev_err(dev, "Couldn't register clock %d - %s\n", dev_err(dev, "Couldn't register clock %d - %s\n",
i, hw->init->name); i, name);
return ret; return ret;
} }
} }