From: Timur Tabi <timur@freescale.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
alsa-devel@alsa-project.org
Subject: [PATCH 1/2] ASoC: core: display the platform node name if there is no platform name
Date: Mon, 10 Sep 2012 17:02:55 -0500 [thread overview]
Message-ID: <1347314576-13832-1-git-send-email-timur@freescale.com> (raw)
A platform can be matched by either a string name or a device tree node
pointer, so we can't assume that dai_link->platform_name is valid. Fix
an error message in soc_bind_dai_link() to use the device tree node
name if the platform name is null.
Signed-off-by: Timur Tabi <timur@freescale.com>
---
sound/soc/soc-core.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ad65459..d81ef5b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -897,7 +897,8 @@ static int soc_bind_dai_link(struct snd_soc_card *card, int num)
}
if (!rtd->platform) {
dev_err(card->dev, "platform %s not registered\n",
- dai_link->platform_name);
+ dai_link->platform_name ? :
+ dai_link->platform_of_node->full_name);
return -EPROBE_DEFER;
}
--
1.7.3.4
next reply other threads:[~2012-09-10 22:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-10 22:02 Timur Tabi [this message]
2012-09-10 22:02 ` [PATCH 2/2] ASoC: fsl: use snd_soc_register_card to register the card Timur Tabi
2012-09-11 0:13 ` Mark Brown
2012-09-11 0:27 ` Tabi Timur-B04825
2012-09-11 0:31 ` Mark Brown
2012-09-11 0:19 ` [PATCH 1/2] ASoC: core: display the platform node name if there is no platform name Mark Brown
2012-09-11 0:27 ` Tabi Timur-B04825
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=1347314576-13832-1-git-send-email-timur@freescale.com \
--to=timur@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.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: 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).