diff options
author | Shreyas NC <shreyas.nc@intel.com> | 2017-05-15 19:44:30 +0530 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-05-24 18:25:25 +0100 |
commit | 0a716776914ed9d7ca90b48041e6767693bfb672 (patch) | |
tree | 0ca7c23cfb0e6d17f4f4f0ca7708b61f674891c0 /sound/soc | |
parent | 5cd1f5c32132101955d7f0e1955249a84f9b6fd9 (diff) | |
download | op-kernel-dev-0a716776914ed9d7ca90b48041e6767693bfb672.zip op-kernel-dev-0a716776914ed9d7ca90b48041e6767693bfb672.tar.gz |
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/soc')
-rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 2 |
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 3a99712..64a0f8e 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); |