diff options
| author |   Shreyas NC <shreyas.nc@intel.com> | 2017-08-23 19:33:48 +0530 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-08-25 14:53:47 +0100 |
| commit | 9fc129f6e5de01ce5fccf033485e40dfa429b45c (patch) | |
| tree | 4e925b8280693ddaaac0a35f8f5b5a43b602bbb7 /sound/soc | |
| parent | ASoC: Intel: Skylake: Fix uninitialized return (diff) | |
| download | linux-dev-9fc129f6e5de01ce5fccf033485e40dfa429b45c.tar.xz linux-dev-9fc129f6e5de01ce5fccf033485e40dfa429b45c.zip | |
ASoC: Intel: Skylake: Parse multiple manifest data blocks
Currently we can parse a single manifest data block. But manifest
private data can have multiple data blocks.
So, fix the parsing logic to parse multiple data blocks by returning
offset of each parsed data block.
Signed-off-by: Shreyas NC <shreyas.nc@intel.com>
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@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 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 350d2387f737..f14b373f65d7 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2721,14 +2721,12 @@ static int skl_tplg_get_manifest_tkn(struct device *dev, tkn_count = tkn_count + ret; tkn_elem++; - tuple_size += tkn_count * - sizeof(struct snd_soc_tplg_vendor_value_elem); - break; } + tuple_size += (tkn_count * sizeof(*tkn_elem)); tkn_count = 0; } - return 0; + return off; } /* @@ -2751,11 +2749,10 @@ static int skl_tplg_get_manifest_data(struct snd_soc_tplg_manifest *manifest, num_blocks = ret; off += array->size; - array = (struct snd_soc_tplg_vendor_array *) - (manifest->priv.data + off); - /* Read the BLOCK_TYPE and BLOCK_SIZE descriptor */ while (num_blocks > 0) { + array = (struct snd_soc_tplg_vendor_array *) + (manifest->priv.data + off); ret = skl_tplg_get_desc_blocks(dev, array); if (ret < 0) @@ -2789,6 +2786,7 @@ static int skl_tplg_get_manifest_data(struct snd_soc_tplg_manifest *manifest, } else { return -EINVAL; } + off += ret; } return 0; |