lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 248/453] ASoC: amd: change clk_get() to devm_clk_get() and add missed checks
    Date
    From: Chuhong Yuan <hslester96@gmail.com>

    [ Upstream commit 95d3befbc5e1ee39fc8a78713924cf7ed2b3cabe ]

    cz_da7219_init() does not check the return values of clk_get(),
    while da7219_clk_enable() calls clk_set_rate() to dereference
    the pointers.
    Add checks to fix the problems.
    Also, change clk_get() to devm_clk_get() to avoid data leak after
    failures.

    Fixes: bb24a31ed584 ("ASoC: AMD: Configure wclk and bclk of master codec")
    Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
    Link: https://lore.kernel.org/r/20201204063610.513556-1-hslester96@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/amd/acp-da7219-max98357a.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
    index f4ee6798154af..1612ec65aaf66 100644
    --- a/sound/soc/amd/acp-da7219-max98357a.c
    +++ b/sound/soc/amd/acp-da7219-max98357a.c
    @@ -73,8 +73,13 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
    return ret;
    }

    - da7219_dai_wclk = clk_get(component->dev, "da7219-dai-wclk");
    - da7219_dai_bclk = clk_get(component->dev, "da7219-dai-bclk");
    + da7219_dai_wclk = devm_clk_get(component->dev, "da7219-dai-wclk");
    + if (IS_ERR(da7219_dai_wclk))
    + return PTR_ERR(da7219_dai_wclk);
    +
    + da7219_dai_bclk = devm_clk_get(component->dev, "da7219-dai-bclk");
    + if (IS_ERR(da7219_dai_bclk))
    + return PTR_ERR(da7219_dai_bclk);

    ret = snd_soc_card_jack_new(card, "Headset Jack",
    SND_JACK_HEADSET | SND_JACK_LINEOUT |
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:40    [W:2.728 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site