diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-07-31 12:35:11 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-08-16 10:20:07 -0700 |
| commit | 1610dd79d0f6202c5c1a91122255fa598679c13a (patch) | |
| tree | ca082d7a7e5272d3691969e40de8721243d964d1 /drivers/clk/meson | |
| parent | d6d251f9bb74435a3e4ade641306f90f75645c5c (diff) | |
| download | linux-1610dd79d0f6202c5c1a91122255fa598679c13a.tar.bz2 | |
clk: meson: axg-audio: 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: Neil Armstrong <narmstrong@baylibre.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20190731193517.237136-4-sboyd@kernel.org
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'drivers/clk/meson')
| -rw-r--r-- | drivers/clk/meson/axg-audio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/clk/meson/axg-audio.c b/drivers/clk/meson/axg-audio.c index 8028ff6f6610..db0b73d53551 100644 --- a/drivers/clk/meson/axg-audio.c +++ b/drivers/clk/meson/axg-audio.c @@ -992,15 +992,18 @@ static int axg_audio_clkc_probe(struct platform_device *pdev) /* Take care to skip the registered input clocks */ for (i = AUD_CLKID_DDR_ARB; i < data->hw_onecell_data->num; i++) { + const char *name; + hw = data->hw_onecell_data->hws[i]; /* array might be sparse */ if (!hw) continue; + name = hw->init->name; + ret = devm_clk_hw_register(dev, hw); if (ret) { - dev_err(dev, "failed to register clock %s\n", - hw->init->name); + dev_err(dev, "failed to register clock %s\n", name); return ret; } } |