lkml.org 
[lkml]   [2019]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 051/137] clk: meson: axg-audio: Dont reference clk_init_data after registration
    Date
    From: Stephen Boyd <sboyd@kernel.org>

    [ 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>
    ---
    drivers/clk/meson/axg-audio.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/clk/meson/axg-audio.c b/drivers/clk/meson/axg-audio.c
    index 8028ff6f66107..db0b73d53551d 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;
    }
    }
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-10-06 19:36    [W:4.289 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site