lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 0411/1126] ASoC: msm8916-wcd-digital: Fix missing clk_disable_unprepare() in msm8916_wcd_digital_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 375a347da4889f64d86e1ab7f4e6702b6e9bf299 ]

    Fix the missing clk_disable_unprepare() before return
    from msm8916_wcd_digital_probe in the error handling case.

    Fixes: 150db8c5afa1 ("ASoC: codecs: Add msm8916-wcd digital codec")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220307084523.28687-1-linmq006@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/msm8916-wcd-digital.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c
    index fcc10c8bc625..9ad7fc0baf07 100644
    --- a/sound/soc/codecs/msm8916-wcd-digital.c
    +++ b/sound/soc/codecs/msm8916-wcd-digital.c
    @@ -1201,7 +1201,7 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)
    ret = clk_prepare_enable(priv->mclk);
    if (ret < 0) {
    dev_err(dev, "failed to enable mclk %d\n", ret);
    - return ret;
    + goto err_clk;
    }

    dev_set_drvdata(dev, priv);
    @@ -1209,6 +1209,9 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)
    return devm_snd_soc_register_component(dev, &msm8916_wcd_digital,
    msm8916_wcd_digital_dai,
    ARRAY_SIZE(msm8916_wcd_digital_dai));
    +err_clk:
    + clk_disable_unprepare(priv->ahbclk);
    + return ret;
    }

    static int msm8916_wcd_digital_remove(struct platform_device *pdev)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 10:25    [W:3.672 / U:1.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site