]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: topology: use name_prefix for new kcontrol
author이경택 <gt82.lee@samsung.com>
Wed, 1 Apr 2020 09:05:24 +0000 (18:05 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Apr 2020 08:48:43 +0000 (10:48 +0200)
commit abca9e4a04fbe9c6df4d48ca7517e1611812af25 upstream.

Current topology doesn't add prefix of component to new kcontrol.

Signed-off-by: Gyeongtaek Lee <gt82.lee@samsung.com>
Link: https://lore.kernel.org/r/009b01d60804$ae25c2d0$0a714870$@samsung.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/soc-topology.c

index 30fc45aa18690547407ec191a37b31ba0918bd02..756dd2303106391a1ae2fb235deb80b26014d872 100644 (file)
@@ -364,7 +364,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg,
        struct snd_soc_component *comp = tplg->comp;
 
        return soc_tplg_add_dcontrol(comp->card->snd_card,
-                               comp->dev, k, NULL, comp, kcontrol);
+                               comp->dev, k, comp->name_prefix, comp, kcontrol);
 }
 
 /* remove a mixer kcontrol */