summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorLiam Girdwood <liam.r.girdwood@linux.intel.com>2017-06-29 14:22:25 +0100
committerMark Brown <broonie@kernel.org>2017-06-30 11:53:59 +0100
commitbb97142bcf8c042103e87d035a120f522d12e788 (patch)
tree08f718212934efc7e460732cc81ea9a326ddf6fc /sound/soc
parentebd259d33a900b28ef774c4c26e8ce6e2baea7e5 (diff)
downloadlinux-bb97142bcf8c042103e87d035a120f522d12e788.tar.gz
linux-bb97142bcf8c042103e87d035a120f522d12e788.tar.bz2
linux-bb97142bcf8c042103e87d035a120f522d12e788.zip
ASoC: topology: Fix usage of SND_SOC_TPLG_INDEX_ALL during load
SND_SOC_TPLG_INDEX_ALL is used by drivers to tell the core to load all topology component indexes, not just the index in the header. Fix this so that SND_SOC_TPLG_INDEX_ALL will load all components no matter their index. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-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 12e189701924..6070e35455aa 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -2381,7 +2381,7 @@ static int soc_tplg_load_header(struct soc_tplg *tplg,
/* check for matching ID */
if (hdr->index != tplg->req_index &&
- hdr->index != SND_SOC_TPLG_INDEX_ALL)
+ tplg->req_index != SND_SOC_TPLG_INDEX_ALL)
return 0;
tplg->index = hdr->index;