From: Jon Hunter <jonathanh@nvidia.com>
To: Mark Brown <broonie@kernel.org>,
Curtis Malainey <cujomalainey@chromium.org>,
linux-tegra <linux-tegra@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>
Subject: Regression: ASoC: soc-core: clear platform pointers on error
Date: Fri, 1 Mar 2019 12:07:02 +0000 [thread overview]
Message-ID: <bbc0d37a-5a08-9ce0-58b6-c89d28c558ce@nvidia.com> (raw)
Hi Mark, Curtis,
I am seeing a regression on -next where the soundcard on one of our
Tegra boards fails to initialise following a probe deferral. The bisect
points to the commit 78a24e10cd94420f1b4e2dc5923ae7109e2aaba1 ('ASoC:
soc-core: clear platform pointers on error') and reverting this on top
of -next fixes the problem.
Looking at the bootlog from the failure I see ...
tegra-snd-wm8903 sound: ASoC: failed to init link WM8903
tegra-snd-wm8903 sound: snd_soc_register_card failed (-517)
tegra30-i2s 70080400.i2s: DMA channels sourced from device 70080000.ahub
tegra-snd-wm8903 sound: ASoC: Both platform name/of_node are set for WM8903
tegra-snd-wm8903 sound: ASoC: failed to init link WM8903
tegra-snd-wm8903 sound: snd_soc_register_card failed (-22)
tegra-snd-wm8903: probe of sound failed with error -22
With the above change I see soc_cleanup_platform() is ever being called
when the probe is deferred and hence leads to the failure. Note that the
initial failure, "ASoC: failed to init link WM8903" occurs very early
in snd_soc_register_card() when initialising the prelinks.
The following fixes it, but I have not scrutinised the code to see if
there are other exit points that we need to handle.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 93d316d5bf8e..6f66beb0c3ae 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2797,6 +2797,7 @@ int snd_soc_register_card(struct snd_soc_card *card)
ret = soc_init_dai_link(card, link);
if (ret) {
+ soc_cleanup_platform(card);
dev_err(card->dev, "ASoC: failed to init link %s\n",
link->name);
mutex_unlock(&client_mutex);
Cheers
Jon
--
nvpublic
next reply other threads:[~2019-03-01 12:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-01 12:07 Jon Hunter [this message]
2019-03-01 17:28 ` Regression: ASoC: soc-core: clear platform pointers on error Curtis Malainey
2019-03-04 13:07 ` Jon Hunter
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=bbc0d37a-5a08-9ce0-58b6-c89d28c558ce@nvidia.com \
--to=jonathanh@nvidia.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cujomalainey@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).