diff options
| author |   Keyon Jie <yang.jie@linux.intel.com> | 2019-09-27 15:05:27 -0500 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-10-01 18:30:47 +0100 |
| commit | 2e305a074061121220a2828f97a57d315cf8efba (patch) | |
| tree | 1e69491b91016d09b497729286e4aef19f62a5e0 /sound | |
| parent | ASoC: SOF: loader: fix kernel oops on firmware boot failure (diff) | |
| download | wireguard-linux-2e305a074061121220a2828f97a57d315cf8efba.tar.xz wireguard-linux-2e305a074061121220a2828f97a57d315cf8efba.zip | |
ASoC: SOF: topology: fix parse fail issue for byte/bool tuple types
We are using sof_parse_word_tokens() to parse tokens with
bool/byte/short/word tuple types, here add the missing check, to fix the
parsing failure at byte/bool tuple types.
Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190927200538.660-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sof/topology.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index fc85efbad378..0aabb3190ddc 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -920,7 +920,9 @@ static void sof_parse_word_tokens(struct snd_soc_component *scomp, for (j = 0; j < count; j++) { /* match token type */ if (!(tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_WORD || - tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_SHORT)) + tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_SHORT || + tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_BYTE || + tokens[j].type == SND_SOC_TPLG_TUPLE_TYPE_BOOL)) continue; /* match token id */ |