Commit 1610dd79 authored Jul 31, 2019 by Stephen Boyd

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>

parent d6d251f9

drivers/clk/meson/axg-audio.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

Admin message