From 9449fc4339fc34f88f56cf28a166c812a8dfcd19 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Mon, 9 Jan 2012 12:09:29 +0000 Subject: [PATCH] --- yaml --- r: 293184 b: refs/heads/master c: 3b09bb820dda209d5c81e329420ccf36dd30c8eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-core.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6d76dcc98347..86c185720186 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 350e16d5293b54e2ef105ebd777f43dbe5a15ffa +refs/heads/master: 3b09bb820dda209d5c81e329420ccf36dd30c8eb diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index b5ecf6d23214..41c8e45a23e2 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -2864,7 +2864,8 @@ int snd_soc_register_card(struct snd_soc_card *card) */ if (!!link->codec_name == !!link->codec_of_node) { dev_err(card->dev, - "Neither/both codec name/of_node are set\n"); + "Neither/both codec name/of_node are set for %s\n", + link->name); return -EINVAL; } @@ -2874,7 +2875,7 @@ int snd_soc_register_card(struct snd_soc_card *card) */ if (link->platform_name && link->platform_of_node) { dev_err(card->dev, - "Both platform name/of_node are set\n"); + "Both platform name/of_node are set for %s\n", link->name); return -EINVAL; } @@ -2884,7 +2885,8 @@ int snd_soc_register_card(struct snd_soc_card *card) */ if (!!link->cpu_dai_name == !!link->cpu_dai_of_node) { dev_err(card->dev, - "Neither/both cpu_dai name/of_node are set\n"); + "Neither/both cpu_dai name/of_node are set for %s\n", + link->name); return -EINVAL; } }