]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: mediatek: Fix missing of_node_put in mt2701_wm8960_machine_probe
authorMiaoqian Lin <linmq006@gmail.com>
Mon, 4 Apr 2022 09:35:25 +0000 (09:35 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 14:59:19 +0000 (16:59 +0200)
[ 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

index 89f34efd9747290f4a62d73c4afd0a4773f4d6c1..a5ede216b79509294225dd08af6abf95aab9f2d0 100644 (file)
@@ -118,7 +118,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 (i = 0; i < card->num_links; i++) {
                if (mt2701_wm8960_dai_links[i].codec_name)
@@ -129,7 +130,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);
@@ -137,6 +138,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;
 }