diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-07-31 22:35:09 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-08-16 20:19:49 +0300 |
| commit | cf9ec1fc6d7cceb73e7f1efd079d2eae173fdf57 (patch) | |
| tree | 5602c1a267429b22d4363ed4f21ab02def38b38d /drivers/clk/actions | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| download | linux-cf9ec1fc6d7cceb73e7f1efd079d2eae173fdf57.tar.xz | |
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>
Diffstat (limited to 'drivers/clk/actions')
| -rw-r--r-- | drivers/clk/actions/owl-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/actions/owl-common.c b/drivers/clk/actions/owl-common.c index 32dd29e0a37e..4de97cc7cb54 100644 --- a/drivers/clk/actions/owl-common.c +++ b/drivers/clk/actions/owl-common.c @@ -68,16 +68,17 @@ int owl_clk_probe(struct device *dev, struct clk_hw_onecell_data *hw_clks) struct clk_hw *hw; for (i = 0; i < hw_clks->num; i++) { + const char *name; hw = hw_clks->hws[i]; - if (IS_ERR_OR_NULL(hw)) continue; + name = hw->init->name; ret = devm_clk_hw_register(dev, hw); if (ret) { dev_err(dev, "Couldn't register clock %d - %s\n", - i, hw->init->name); + i, name); return ret; } } |