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

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

ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() 



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

sound/soc/generic/simple-card.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -286,14 +286,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, 
	if (ret < 0)

	if (ret < 0)

		goto dai_link_of_err;

		goto dai_link_of_err;





	if (!dai_link->cpu_dai_name || !dai_link->codec_dai_name) {

	ret = asoc_simple_card_canonicalize_dailink(dai_link);

		ret = -EINVAL;

	if (ret < 0)

		goto dai_link_of_err;

		goto dai_link_of_err;

	}



	/* Assumes platform == cpu */

	if (!dai_link->platform_of_node)

		dai_link->platform_of_node = dai_link->cpu_of_node;





	ret = asoc_simple_card_set_dailink_name(dev, dai_link,

	ret = asoc_simple_card_set_dailink_name(dev, dai_link,

						"%s-%s",

						"%s-%s",