]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
clk: meson: axg-audio: Don't reference clk_init_data after registration
authorStephen Boyd <sboyd@kernel.org>
Wed, 31 Jul 2019 19:35:11 +0000 (12:35 -0700)
committerStephen Boyd <sboyd@kernel.org>
Fri, 16 Aug 2019 17:20:07 +0000 (10:20 -0700)
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>
drivers/clk/meson/axg-audio.c

index 8028ff6f661075168f6e41afde073f0082d1d932..db0b73d53551de11ba0f7445f584b6060d675368 100644 (file)
@@ -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;
                }
        }