| From 87df87873d3fd97255e5ae7bf0e91845ddafc142 Mon Sep 17 00:00:00 2001 |
| From: Keyon Jie <yang.jie@linux.intel.com> |
| Date: Fri, 27 Sep 2019 15:05:27 -0500 |
| Subject: [PATCH] ASoC: SOF: topology: fix parse fail issue for byte/bool tuple |
| types |
| |
| commit 2e305a074061121220a2828f97a57d315cf8efba upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c |
| index c88afa872a58..40fe6d842f59 100644 |
| --- a/sound/soc/sof/topology.c |
| +++ b/sound/soc/sof/topology.c |
| @@ -901,7 +901,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 */ |
| -- |
| 2.7.4 |
| |
