| From d12ccb5e1b808a6fbf12a7e15e80579399086497 Mon Sep 17 00:00:00 2001 |
| From: Shreyas NC <shreyas.nc@intel.com> |
| Date: Mon, 15 May 2017 19:44:30 +0530 |
| Subject: ASoC: Intel: Skylake: Fix to parse consecutive string tkns in |
| manifest |
| |
| [ Upstream commit 0a716776914ed9d7ca90b48041e6767693bfb672 ] |
| |
| Element size in the manifest should be updated for each token, so that the |
| loop can parse all the string elements in the manifest. This was not |
| happening when more than two string elements appear consecutively, as it is |
| not updated with correct string element size. Fixed with this patch. |
| |
| Signed-off-by: Shreyas NC <shreyas.nc@intel.com> |
| Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> |
| Acked-by: Vinod Koul <vinod.koul@intel.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/intel/skylake/skl-topology.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c |
| index bef8a4546c12..b0c154d5924b 100644 |
| --- a/sound/soc/intel/skylake/skl-topology.c |
| +++ b/sound/soc/intel/skylake/skl-topology.c |
| @@ -2325,7 +2325,7 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, |
| |
| if (ret < 0) |
| return ret; |
| - tkn_count += ret; |
| + tkn_count = ret; |
| |
| tuple_size += tkn_count * |
| sizeof(struct snd_soc_tplg_vendor_string_elem); |
| -- |
| 2.17.1 |
| |