[alsa-devel] [PATCH 1/2] ASoC: core: display the platform node name if there is no platform name

Timur Tabi timur at freescale.com
Tue Sep 11 00:02:55 CEST 2012

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 at 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;

More information about the Alsa-devel mailing list