[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181016104730.4598-10-marcel@ziswiler.com>
Date: Tue, 16 Oct 2018 12:47:30 +0200
From: Marcel Ziswiler <marcel@...wiler.com>
To: devicetree@...r.kernel.org, linux-tegra@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: Russell King - ARM Linux <linux@...linux.org.uk>,
Mark Brown <broonie@...nel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
Marcel Ziswiler <marcel.ziswiler@...adex.com>,
Jaroslav Kysela <perex@...ex.cz>, alsa-devel@...a-project.org,
Thierry Reding <thierry.reding@...il.com>,
Jonathan Hunter <jonathanh@...dia.com>,
Takashi Iwai <tiwai@...e.com>,
Liam Girdwood <lgirdwood@...il.com>
Subject: [PATCH v2 9/9] ASoC: tegra_sgtl5000: fix platform name vs. of_node assignement
From: Marcel Ziswiler <marcel.ziswiler@...adex.com>
This fixes the following error as seen post commit daecf46ee0e5
("ASoC: soc-core: use snd_soc_dai_link_component for platform"):
tegra-snd-sgtl5000 sound: ASoC: Both platform name/of_node are set for
sgtl5000
tegra-snd-sgtl5000 sound: ASoC: failed to init link sgtl5000
tegra-snd-sgtl5000 sound: snd_soc_register_card failed (-22)
tegra-snd-sgtl5000: probe of sound failed with error -22
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@...adex.com>
---
Changes in v2: New patch
sound/soc/tegra/tegra_sgtl5000.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sound/soc/tegra/tegra_sgtl5000.c b/sound/soc/tegra/tegra_sgtl5000.c
index 901457da25ec..eb702925cac3 100644
--- a/sound/soc/tegra/tegra_sgtl5000.c
+++ b/sound/soc/tegra/tegra_sgtl5000.c
@@ -168,6 +168,11 @@ static int tegra_sgtl5000_driver_probe(struct platform_device *pdev)
return 0;
err_fini_utils:
+ if (tegra_sgtl5000_dai.platform) {
+ devm_kfree(&pdev->dev, tegra_sgtl5000_dai.platform);
+ tegra_sgtl5000_dai.platform = NULL;
+ }
+
tegra_asoc_utils_fini(&machine->util_data);
err_put_cpu_of_node:
of_node_put(tegra_sgtl5000_dai.cpu_of_node);
--
2.14.4
Powered by blists - more mailing lists