lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 283/879] ASoC: mediatek: Fix missing of_node_put in mt2701_wm8960_machine_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 05654431a18fe24e5e46a375d98904134628a102 ]

    This node pointer is returned by of_parse_phandle() with
    refcount incremented in this function.
    Calling of_node_put() to avoid the refcount leak.

    Fixes: 8625c1dbd876 ("ASoC: mediatek: Add mt2701-wm8960 machine driver")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Link: https://lore.kernel.org/r/20220404093526.30004-1-linmq006@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/mediatek/mt2701/mt2701-wm8960.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/mediatek/mt2701/mt2701-wm8960.c b/sound/soc/mediatek/mt2701/mt2701-wm8960.c
    index f56de1b918bf..0cdf2ae36243 100644
    --- a/sound/soc/mediatek/mt2701/mt2701-wm8960.c
    +++ b/sound/soc/mediatek/mt2701/mt2701-wm8960.c
    @@ -129,7 +129,8 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev)
    if (!codec_node) {
    dev_err(&pdev->dev,
    "Property 'audio-codec' missing or invalid\n");
    - return -EINVAL;
    + ret = -EINVAL;
    + goto put_platform_node;
    }
    for_each_card_prelinks(card, i, dai_link) {
    if (dai_link->codecs->name)
    @@ -140,7 +141,7 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev)
    ret = snd_soc_of_parse_audio_routing(card, "audio-routing");
    if (ret) {
    dev_err(&pdev->dev, "failed to parse audio-routing: %d\n", ret);
    - return ret;
    + goto put_codec_node;
    }

    ret = devm_snd_soc_register_card(&pdev->dev, card);
    @@ -148,6 +149,10 @@ static int mt2701_wm8960_machine_probe(struct platform_device *pdev)
    dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
    __func__, ret);

    +put_codec_node:
    + of_node_put(codec_node);
    +put_platform_node:
    + of_node_put(platform_node);
    return ret;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:27    [W:8.405 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site