From: Marcel Ziswiler <marcel@ziswiler.com> To: alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, Liam Girdwood <lgirdwood@gmail.com>, Marcel Ziswiler <marcel.ziswiler@toradex.com>, Takashi Iwai <tiwai@suse.com>, Jonathan Hunter <jonathanh@nvidia.com>, Mark Brown <broonie@kernel.org>, Thierry Reding <thierry.reding@gmail.com> Subject: [PATCH v1 1/3] ASoC: tegra_sgtl5000: fix device_node refcounting Date: Thu, 18 Oct 2018 13:18:27 +0200 [thread overview] Message-ID: <20181018111829.27056-2-marcel@ziswiler.com> (raw) In-Reply-To: <20181018111829.27056-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> Acked-by: Jon Hunter <jonathanh@nvidia.com> --- Changes in v1: None 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
WARNING: multiple messages have this Message-ID (diff)
From: Marcel Ziswiler <marcel@ziswiler.com> To: alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mark Brown <broonie@kernel.org>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, Marcel Ziswiler <marcel.ziswiler@toradex.com>, Jaroslav Kysela <perex@perex.cz>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com>, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com> Subject: [PATCH v1 1/3] ASoC: tegra_sgtl5000: fix device_node refcounting Date: Thu, 18 Oct 2018 13:18:27 +0200 [thread overview] Message-ID: <20181018111829.27056-2-marcel@ziswiler.com> (raw) In-Reply-To: <20181018111829.27056-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> Acked-by: Jon Hunter <jonathanh@nvidia.com> --- Changes in v1: None 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
next prev parent reply other threads:[~2018-10-18 11:18 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-18 11:18 [PATCH v1 0/3] ASoC: last minute fixes Marcel Ziswiler 2018-10-18 11:18 ` Marcel Ziswiler 2018-10-18 11:18 ` Marcel Ziswiler [this message] 2018-10-18 11:18 ` [PATCH v1 1/3] ASoC: tegra_sgtl5000: fix device_node refcounting Marcel Ziswiler 2018-10-18 11:18 ` [PATCH v1 2/3] ASoC: soc-core: fix trivial checkpatch issues Marcel Ziswiler 2018-10-18 11:18 ` Marcel Ziswiler 2018-10-19 12:26 ` Applied "ASoC: soc-core: fix trivial checkpatch issues" to the asoc tree Mark Brown 2018-10-19 12:26 ` Mark Brown 2018-10-19 12:26 ` Mark Brown 2018-10-19 12:34 ` Mark Brown 2018-10-19 12:34 ` Mark Brown 2018-10-19 12:34 ` Mark Brown 2018-10-18 11:18 ` [PATCH v1 3/3] ASoC: soc-core: fix platform name vs. of_node assignement Marcel Ziswiler 2018-10-18 11:18 ` Marcel Ziswiler 2018-10-19 10:22 ` Jon Hunter 2018-10-19 10:22 ` Jon Hunter 2018-10-21 11:23 ` Mark Brown 2018-10-21 11:23 ` Mark Brown 2018-12-18 17:40 ` Matthias Reichl 2018-12-18 17:40 ` [alsa-devel] " Matthias Reichl 2019-01-03 16:42 ` Jon Hunter 2019-01-03 16:42 ` Jon Hunter 2019-01-08 2:25 ` Kuninori Morimoto 2019-01-08 2:25 ` Kuninori Morimoto 2019-01-08 10:50 ` Jon Hunter 2019-01-08 10:50 ` [alsa-devel] " Jon Hunter 2019-01-08 12:03 ` Jon Hunter 2019-01-08 12:03 ` Jon Hunter 2019-01-08 15:48 ` Jon Hunter 2019-01-08 15:48 ` Jon Hunter 2019-01-08 16:09 ` Mark Brown 2019-01-08 16:09 ` [alsa-devel] " Mark Brown 2019-01-09 1:51 ` Kuninori Morimoto 2019-01-09 1:51 ` Kuninori Morimoto 2019-01-09 11:03 ` Jon Hunter 2019-01-09 11:03 ` Jon Hunter 2019-01-09 12:53 ` Mark Brown 2019-01-09 12:53 ` [alsa-devel] " Mark Brown 2019-01-09 14:11 ` Jon Hunter 2019-01-09 14:11 ` Jon Hunter 2019-01-09 14:14 ` Mark Brown 2019-01-09 14:14 ` [alsa-devel] " Mark Brown 2019-01-10 1:16 ` Kuninori Morimoto 2019-01-10 3:46 ` Kuninori Morimoto 2019-01-10 10:56 ` Jon Hunter 2019-01-10 10:56 ` Jon Hunter 2019-01-11 0:52 ` Kuninori Morimoto 2019-01-11 0:52 ` [alsa-devel] " Kuninori Morimoto 2019-01-11 8:41 ` Jon Hunter 2019-01-11 8:41 ` Jon Hunter 2019-01-11 8:51 ` Kuninori Morimoto 2019-01-11 8:51 ` Kuninori Morimoto 2019-01-11 9:15 ` Jon Hunter 2019-01-11 9:15 ` Jon Hunter 2019-01-14 23:02 ` Mark Brown 2019-01-14 23:02 ` [alsa-devel] " Mark Brown 2019-01-15 15:26 ` Jon Hunter 2019-01-15 15:26 ` Jon Hunter 2019-01-15 18:07 ` Matthias Reichl 2019-01-08 15:33 ` Mark Brown 2019-01-08 15:33 ` [alsa-devel] " 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=20181018111829.27056-2-marcel@ziswiler.com \ --to=marcel@ziswiler.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@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=marcel.ziswiler@toradex.com \ --cc=thierry.reding@gmail.com \ --cc=tiwai@suse.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.