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

Commit dedfaa1e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: enable "label" on asoc_simple_card_parse_card_name 



Current asoc_simple_card_parse_card_name() detects [prefix]name,
but in generally, we uses "label" for user visible names.
This patch enables it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5711c979

sound/soc/generic/simple-card-utils.c

+11 −5
Original line number Diff line number Diff line
@@ -81,15 +81,21 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_set_dailink_name); 
int asoc_simple_card_parse_card_name(struct snd_soc_card *card,

				     char *prefix)

{

	char prop[128];

	int ret;



	snprintf(prop, sizeof(prop), "%sname", prefix);

	if (!prefix)

		prefix = "";



	/* Parse the card name from DT */

	ret = snd_soc_of_parse_card_name(card, "label");

	if (ret < 0) {

		char prop[128];



		snprintf(prop, sizeof(prop), "%sname", prefix);

		ret = snd_soc_of_parse_card_name(card, prop);

		if (ret < 0)

			return ret;

	}



	if (!card->name && card->dai_link)

		card->name = card->dai_link->name;