diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-07-31 12:35:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 18:58:59 +0200 |
| commit | 5a90971761cd8e3416de16a8cca614f5b7237b84 (patch) | |
| tree | 7d7a46644dfcee79b81c4ec00982df806e037b91 | |
| parent | 672ce7241a4006d42b8d7a2c946c08a5a34a4428 (diff) | |
| download | linux-stable-5a90971761cd8e3416de16a8cca614f5b7237b84.tar.gz linux-stable-5a90971761cd8e3416de16a8cca614f5b7237b84.tar.bz2 linux-stable-5a90971761cd8e3416de16a8cca614f5b7237b84.zip | |
clk: actions: Don't reference clk_init_data after registration
[ Upstream commit cf9ec1fc6d7cceb73e7f1efd079d2eae173fdf57 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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; } } |