From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH] ASoC: topology: Fix usage of SND_SOC_TPLG_INDEX_ALL during load
Date: Thu, 29 Jun 2017 14:22:25 +0100 [thread overview]
Message-ID: <1498742546-23463-2-git-send-email-liam.r.girdwood@linux.intel.com> (raw)
In-Reply-To: <1498742546-23463-1-git-send-email-liam.r.girdwood@linux.intel.com>
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>
---
sound/soc/soc-topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 10797d74a700..06fb7c4c664a 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -2389,7 +2389,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;
--
2.11.0
next prev parent reply other threads:[~2017-06-29 13:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-29 13:22 [PATCHv4] ASoC: dapm: Add new widget type for constructing DAPM graphs on DSPs Liam Girdwood
2017-06-29 13:22 ` Liam Girdwood [this message]
2017-06-30 11:59 ` Applied "ASoC: topology: Fix usage of SND_SOC_TPLG_INDEX_ALL during load" to the asoc tree Mark Brown
2017-06-29 13:22 ` [PATCH] ASoC: topology: show index in debug when adding DAPM routes Liam Girdwood
2017-06-30 11:59 ` Applied "ASoC: topology: show index in debug when adding DAPM routes" to the asoc tree Mark Brown
2017-06-30 11:59 ` Applied "ASoC: dapm: Add new widget type for constructing DAPM graphs on DSPs." " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1498742546-23463-2-git-send-email-liam.r.girdwood@linux.intel.com \
--to=liam.r.girdwood@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).