summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorYan Wang <yan.wang@linux.intel.com>2018-03-26 16:48:00 +0100
committerMark Brown <broonie@kernel.org>2018-04-17 12:27:24 +0100
commitfeb12f0cd8d7b1e8df2e6fce19fc9a026a468cc2 (patch)
tree9959d3141c997fe309a0cd53f8e6f9e9401d814e /sound
parentdc29f581fa9d5567c3a01ecfdd7f16b2e613c7fb (diff)
downloadlinux-stable-feb12f0cd8d7b1e8df2e6fce19fc9a026a468cc2.tar.gz
linux-stable-feb12f0cd8d7b1e8df2e6fce19fc9a026a468cc2.tar.bz2
linux-stable-feb12f0cd8d7b1e8df2e6fce19fc9a026a468cc2.zip
ASoC: topology: Fix bugs of freeing soc topology
In snd_soc_tplg_component_remove(), it should compare index and not dobj->index with SND_SOC_TPLG_INDEX_ALL for removing all topology objects. Signed-off-by: Yan Wang <yan.wang@linux.intel.com> Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 942c6e5eb4b7..5598e891b2b3 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -2580,7 +2580,7 @@ int snd_soc_tplg_component_remove(struct snd_soc_component *comp, u32 index)
/* match index */
if (dobj->index != index &&
- dobj->index != SND_SOC_TPLG_INDEX_ALL)
+ index != SND_SOC_TPLG_INDEX_ALL)
continue;
switch (dobj->type) {