summaryrefslogtreecommitdiff
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-04-26 13:02:03 +0300
committerMark Brown <broonie@kernel.org>2019-04-26 13:02:03 +0300
commit93f38ef6a4b62fd57076d36d1345d69f8a328ad9 (patch)
treebc7f20d968c8d1f7374927bd187d3f26f786459d /sound/soc/soc-topology.c
parent552f2d7edd38e29073f8036191320f09b534c480 (diff)
parent780f202f2bf48aaa09282efc4dd6c39a146cc1f3 (diff)
downloadlinux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.xz
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/soc-topology.c')
-rw-r--r--sound/soc/soc-topology.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 51903ca7614b..3299ebb48c1a 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -484,10 +484,11 @@ static void remove_widget(struct snd_soc_component *comp,
snd_ctl_remove(card, kcontrol);
- kfree(dobj->control.dvalues);
+ /* free enum kcontrol's dvalues and dtexts */
+ kfree(se->dobj.control.dvalues);
for (j = 0; j < se->items; j++)
- kfree(dobj->control.dtexts[j]);
- kfree(dobj->control.dtexts);
+ kfree(se->dobj.control.dtexts[j]);
+ kfree(se->dobj.control.dtexts);
kfree(se);
kfree(w->kcontrol_news[i].name);