summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorShreyas NC <shreyas.nc@intel.com>2017-05-15 16:14:30 +0200
committerMark Brown <broonie@kernel.org>2017-05-24 19:25:25 +0200
commit0a716776914ed9d7ca90b48041e6767693bfb672 (patch)
tree0ca7c23cfb0e6d17f4f4f0ca7708b61f674891c0 /sound
parentASoC: Intel: Skylake: Fix IPC rx_list corruption (diff)
downloadlinux-0a716776914ed9d7ca90b48041e6767693bfb672.tar.xz
linux-0a716776914ed9d7ca90b48041e6767693bfb672.zip
ASoC: Intel: Skylake: Fix to parse consecutive string tkns in manifest
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/skylake/skl-topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index 3a99712e44a8..64a0f8ed33e1 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -2502,7 +2502,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);