ASoC: tegra_sgtl5000: fix device_node refcounting

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>

diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index 45a4aa9d2a479a2c5ff82ac39ec06c30bf0952d2..901457da25ec3138bfca79359e6199576f89c979 100644 (file)
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -149,14 +149,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) {
@@ -169,6 +169,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;
 }
@@ -183,6 +190,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;
 }