Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b09bb82 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: core - Improve card registration error messaging for large DAI 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: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 350e16d5

sound/soc/soc-core.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}