Unverified Commit 2e305a07 authored Sep 27, 2019 by Keyon Jie Committed by Mark Brown Oct 01, 2019

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>

parent 79861488

sound/soc/sof/topology.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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 */