Skip to content

Commit

Permalink
ASoC: core - Improve card registration error messaging for large DAI …
Browse files Browse the repository at this point in the history
…links.

Print out the offending DAI link entry when a naming error occurs. Makes
thing easier to debug for machines with a large number of DAI links.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Liam Girdwood authored and Mark Brown committed Jan 20, 2012
1 parent 350e16d commit 3b09bb8
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}
}
Expand Down

0 comments on commit 3b09bb8

Please sign in to comment.