lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.3 002/140] ASoC: samsung: arndale: Add missing OF node dereferencing
    Date
    From: Sylwester Nawrocki <s.nawrocki@samsung.com>

    [ Upstream commit fb629fa2587d0c150792d87e3053664bfc8dc78c ]

    Ensure there is no OF node references kept when the driver
    is removed/unbound.

    Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
    Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
    Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
    Link: https://lore.kernel.org/r/20190920130218.32690-3-s.nawrocki@samsung.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/samsung/arndale_rt5631.c | 34 ++++++++++++++++++++++++++----
    1 file changed, 30 insertions(+), 4 deletions(-)

    diff --git a/sound/soc/samsung/arndale_rt5631.c b/sound/soc/samsung/arndale_rt5631.c
    index c213913eb9848..fd8c6642fb0df 100644
    --- a/sound/soc/samsung/arndale_rt5631.c
    +++ b/sound/soc/samsung/arndale_rt5631.c
    @@ -5,6 +5,7 @@
    // Author: Claude <claude@insginal.co.kr>

    #include <linux/module.h>
    +#include <linux/of_device.h>
    #include <linux/platform_device.h>
    #include <linux/clk.h>

    @@ -74,6 +75,17 @@ static struct snd_soc_card arndale_rt5631 = {
    .num_links = ARRAY_SIZE(arndale_rt5631_dai),
    };

    +static void arndale_put_of_nodes(struct snd_soc_card *card)
    +{
    + struct snd_soc_dai_link *dai_link;
    + int i;
    +
    + for_each_card_prelinks(card, i, dai_link) {
    + of_node_put(dai_link->cpus->of_node);
    + of_node_put(dai_link->codecs->of_node);
    + }
    +}
    +
    static int arndale_audio_probe(struct platform_device *pdev)
    {
    int n, ret;
    @@ -103,18 +115,31 @@ static int arndale_audio_probe(struct platform_device *pdev)
    if (!arndale_rt5631_dai[0].codecs->of_node) {
    dev_err(&pdev->dev,
    "Property 'samsung,audio-codec' missing or invalid\n");
    - return -EINVAL;
    + ret = -EINVAL;
    + goto err_put_of_nodes;
    }
    }

    ret = devm_snd_soc_register_card(card->dev, card);
    + if (ret) {
    + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret);
    + goto err_put_of_nodes;
    + }
    + return 0;

    - if (ret)
    - dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
    -
    +err_put_of_nodes:
    + arndale_put_of_nodes(card);
    return ret;
    }

    +static int arndale_audio_remove(struct platform_device *pdev)
    +{
    + struct snd_soc_card *card = platform_get_drvdata(pdev);
    +
    + arndale_put_of_nodes(card);
    + return 0;
    +}
    +
    static const struct of_device_id samsung_arndale_rt5631_of_match[] __maybe_unused = {
    { .compatible = "samsung,arndale-rt5631", },
    { .compatible = "samsung,arndale-alc5631", },
    @@ -129,6 +154,7 @@ static struct platform_driver arndale_audio_driver = {
    .of_match_table = of_match_ptr(samsung_arndale_rt5631_of_match),
    },
    .probe = arndale_audio_probe,
    + .remove = arndale_audio_remove,
    };

    module_platform_driver(arndale_audio_driver);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-08 20:16    [W:4.059 / U:0.504 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site