diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-07-31 12:35:11 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-07 18:59:07 +0200 |
commit | 3c384b6618181461fca4ecbbaf84c8fbf0df0c14 (patch) | |
tree | 8ddbefc5608aaeebbe2765f8508d25ea262cd4a8 | |
parent | 8e9a12894cc30adfab29ad1fc6ff4186bb6e1e2b (diff) | |
download | linux-stable-3c384b6618181461fca4ecbbaf84c8fbf0df0c14.tar.gz linux-stable-3c384b6618181461fca4ecbbaf84c8fbf0df0c14.tar.bz2 linux-stable-3c384b6618181461fca4ecbbaf84c8fbf0df0c14.zip |
clk: meson: axg-audio: Don't reference clk_init_data after registration
[ Upstream commit 1610dd79d0f6202c5c1a91122255fa598679c13a ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-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; } } |