diff options
| author | Yan Wang <yan.wang@linux.intel.com> | 2018-03-26 18:48:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-06-20 22:02:42 +0300 |
| commit | d5cf1ed8d3ae37a6115a0696a4885df1c777a9e9 (patch) | |
| tree | f3d6b51bfa3135d7f6fc326e4e838745fe3ae40f /sound | |
| parent | bd8acfd77dd336afa8f22bb6f0ed24a7d479c355 (diff) | |
| download | linux-d5cf1ed8d3ae37a6115a0696a4885df1c777a9e9.tar.xz | |
ASoC: topology: Fix bugs of freeing soc topology
[ Upstream commit feb12f0cd8d7b1e8df2e6fce19fc9a026a468cc2 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index e5049fbfc4f1..b64d128ecdac 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2571,7 +2571,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) { |