Unverified Commit 3256ef98 authored Nov 02, 2020 by Sameer Pujar Committed by Mark Brown Nov 10, 2020

ASoC: soc-core: Fix component name_prefix parsing

The "prefix" can be defined in DAI link node or it can be specified as
part of the component node itself. Currently "sound-name-prefix" defined
in a component is not taking effect. Actually the property is not getting
parsed. It can be fixed by parsing "sound-name-prefix" property whenever
"prefix" is missing in DAI link Codec node.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Link: https://lore.kernel.org/r/1604329814-24779-2-git-send-email-spujar@nvidia.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent 513e22f3

sound/soc/soc-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1124,7 +1124,8 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
		for (i = 0; i < card->num_configs; i++) {
		struct snd_soc_codec_conf *map = &card->codec_conf[i];

		if (snd_soc_is_matching_component(&map->dlc, component)) {
		if (snd_soc_is_matching_component(&map->dlc, component) &&
		map->name_prefix) {
		component->name_prefix = map->name_prefix;
		return;
		}