lkml.org 
[lkml]   [2022]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.15 40/44] ASoC: mediatek: mt8183: fix device_node leak
    Date
    From: Tzung-Bi Shih <tzungbi@google.com>

    [ Upstream commit cb006006fe6221f092fadaffd3f219288304c9ad ]

    Fixes the device_node leak.

    Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
    Link: https://lore.kernel.org/r/20211224064719.2031210-3-tzungbi@google.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 6 +++++-
    sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 7 ++++++-
    2 files changed, 11 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
    index a4d26a6fc8492..bda103211e0bd 100644
    --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
    +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
    @@ -781,7 +781,11 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
    return ret;
    }

    - return devm_snd_soc_register_card(&pdev->dev, card);
    + ret = devm_snd_soc_register_card(&pdev->dev, card);
    +
    + of_node_put(platform_node);
    + of_node_put(hdmi_codec);
    + return ret;
    }

    #ifdef CONFIG_OF
    diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
    index 94dcbd36c8697..c7b10c48c6c22 100644
    --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
    +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
    @@ -780,7 +780,12 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev)
    __func__, ret);
    }

    - return devm_snd_soc_register_card(&pdev->dev, card);
    + ret = devm_snd_soc_register_card(&pdev->dev, card);
    +
    + of_node_put(platform_node);
    + of_node_put(ec_codec);
    + of_node_put(hdmi_codec);
    + return ret;
    }

    #ifdef CONFIG_OF
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-01-17 18:08    [W:4.230 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site