lkml.org 
[lkml]   [2022]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 11/86] ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit e927b05f3cc20de87f6b7d912a5bbe556931caca ]

    devm_snd_soc_register_component() may fails, we should check the error
    and do the corresponding error handling.

    Fixes: 150db8c5afa1 ("ASoC: codecs: Add msm8916-wcd digital codec")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220403115239.30140-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 | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c
    index 9ad7fc0baf07..20a07c92b2fc 100644
    --- a/sound/soc/codecs/msm8916-wcd-digital.c
    +++ b/sound/soc/codecs/msm8916-wcd-digital.c
    @@ -1206,9 +1206,16 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev)

    dev_set_drvdata(dev, priv);

    - return devm_snd_soc_register_component(dev, &msm8916_wcd_digital,
    + ret = devm_snd_soc_register_component(dev, &msm8916_wcd_digital,
    msm8916_wcd_digital_dai,
    ARRAY_SIZE(msm8916_wcd_digital_dai));
    + if (ret)
    + goto err_mclk;
    +
    + return 0;
    +
    +err_mclk:
    + clk_disable_unprepare(priv->mclk);
    err_clk:
    clk_disable_unprepare(priv->ahbclk);
    return ret;
    --
    2.35.1


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