lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 034/151] ASoC: tegra_sgtl5000: fix device_node refcounting
    Date
    From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

    [ Upstream commit a85227da2dcc291b762c8482a505bc7d0d2d4b07 ]

    Similar to the following:

    commit 4321723648b0 ("ASoC: tegra_alc5632: fix device_node refcounting")

    commit 7c5dfd549617 ("ASoC: tegra: fix device_node refcounting")

    Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
    Acked-by: Jon Hunter <jonathanh@nvidia.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/tegra/tegra_sgtl5000.c | 17 +++++++++++++++--
    1 file changed, 15 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
    index 1e76869dd4880..863e04809a6b8 100644
    --- a/sound/soc/tegra/tegra_sgtl5000.c
    +++ b/sound/soc/tegra/tegra_sgtl5000.c
    @@ -152,14 +152,14 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
    dev_err(&pdev->dev,
    "Property 'nvidia,i2s-controller' missing/invalid\n");
    ret = -EINVAL;
    - goto err;
    + goto err_put_codec_of_node;
    }

    tegra_sgtl5000_dai.platform_of_node = tegra_sgtl5000_dai.cpu_of_node;

    ret = tegra_asoc_utils_init(&machine->util_data, &pdev->dev);
    if (ret)
    - goto err;
    + goto err_put_cpu_of_node;

    ret = snd_soc_register_card(card);
    if (ret) {
    @@ -172,6 +172,13 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)

    err_fini_utils:
    tegra_asoc_utils_fini(&machine->util_data);
    +err_put_cpu_of_node:
    + of_node_put(tegra_sgtl5000_dai.cpu_of_node);
    + tegra_sgtl5000_dai.cpu_of_node = NULL;
    + tegra_sgtl5000_dai.platform_of_node = NULL;
    +err_put_codec_of_node:
    + of_node_put(tegra_sgtl5000_dai.codec_of_node);
    + tegra_sgtl5000_dai.codec_of_node = NULL;
    err:
    return ret;
    }
    @@ -186,6 +193,12 @@ static int tegra_sgtl5000_driver_remove(struct platform_device *pdev)

    tegra_asoc_utils_fini(&machine->util_data);

    + of_node_put(tegra_sgtl5000_dai.cpu_of_node);
    + tegra_sgtl5000_dai.cpu_of_node = NULL;
    + tegra_sgtl5000_dai.platform_of_node = NULL;
    + of_node_put(tegra_sgtl5000_dai.codec_of_node);
    + tegra_sgtl5000_dai.codec_of_node = NULL;
    +
    return ret;
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 21:41    [W:4.069 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site