lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 562/779] ASoC: samsung: Fix error handling in aries_audio_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 3e2649c5e8643bea0867bb1dd970fedadb0eb7f3 ]

    of_get_child_by_name() returns a node pointer with refcount
    incremented, we should use of_node_put() on it when not need anymore.
    This function is missing of_node_put(cpu) in the error path.
    Fix this by goto out label. of_node_put() will check NULL pointer.

    Fixes: 7a3a7671fa6c ("ASoC: samsung: Add driver for Aries boards")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
    Link: https://lore.kernel.org/r/20220603130640.37624-1-linmq006@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/samsung/aries_wm8994.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
    index 83acbe57b248..a0825da9fff9 100644
    --- a/sound/soc/samsung/aries_wm8994.c
    +++ b/sound/soc/samsung/aries_wm8994.c
    @@ -628,8 +628,10 @@ static int aries_audio_probe(struct platform_device *pdev)
    return -EINVAL;

    codec = of_get_child_by_name(dev->of_node, "codec");
    - if (!codec)
    - return -EINVAL;
    + if (!codec) {
    + ret = -EINVAL;
    + goto out;
    + }

    for_each_card_prelinks(card, i, dai_link) {
    dai_link->codecs->of_node = of_parse_phandle(codec,
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 21:37    [W:3.175 / U:2.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site