linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcel Ziswiler <marcel@ziswiler.com>
To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>,
	Mark Brown <broonie@kernel.org>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	Marcel Ziswiler <marcel.ziswiler@toradex.com>,
	Jaroslav Kysela <perex@perex.cz>,
	alsa-devel@alsa-project.org,
	Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH v2 8/9] ASoC: tegra_sgtl5000: fix device_node refcounting
Date: Tue, 16 Oct 2018 12:47:29 +0200	[thread overview]
Message-ID: <20181016104730.4598-9-marcel@ziswiler.com> (raw)
In-Reply-To: <20181016104730.4598-1-marcel@ziswiler.com>

From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

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>

---

Changes in v2: New patch

 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 45a4aa9d2a47..901457da25ec 100644
--- 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;
 }
 
-- 
2.14.4


  parent reply	other threads:[~2018-10-16 10:49 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-16 10:47 [PATCH v2 0/9] ARM: dts: tegra: last minute fixes Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 1/9] ARM: tegra: fix simple-panel compatibles Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 2/9] ARM: tegra: apalis-tk1/colibri_t20/t30: eval/iris: fix regulator gpio enable Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 3/9] ARM: tegra: colibri_t20: reorder pmic properties Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 4/9] ARM: tegra: apalis-tk1: further regulator clean-up Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 5/9] ARM: tegra: apalis_t30/tk1: annotate power I2C being on-module Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 6/9] ARM: tegra: colibri_t30: further regulator clean-up Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 7/9] ARM: tegra: apalis_t30: " Marcel Ziswiler
2018-10-16 10:47 ` Marcel Ziswiler [this message]
2018-10-17 10:57   ` [PATCH v2 8/9] ASoC: tegra_sgtl5000: fix device_node refcounting Jon Hunter
2018-10-16 10:47 ` [PATCH v2 9/9] ASoC: tegra_sgtl5000: fix platform name vs. of_node assignement Marcel Ziswiler
2018-10-17 12:32   ` Jon Hunter
2018-10-17 14:28     ` Marcel Ziswiler
2018-10-17 19:16       ` Mark Brown
2018-10-17 19:50         ` Jon Hunter
2018-10-17 21:33         ` Marcel Ziswiler
2018-10-16 11:58 ` [PATCH v2 0/9] ARM: dts: tegra: last minute fixes Mark Brown
2018-10-16 12:10   ` Marcel Ziswiler
2018-10-17 10:51   ` Marcel Ziswiler
2018-10-17 11:44     ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181016104730.4598-9-marcel@ziswiler.com \
    --to=marcel@ziswiler.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=marcel.ziswiler@toradex.com \
    --cc=perex@perex.cz \
    --cc=thierry.reding@gmail.com \
    --cc=tiwai@suse.com \
    --subject='Re: [PATCH v2 8/9] ASoC: tegra_sgtl5000: fix device_node refcounting' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).