Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc129f6 authored by Shreyas NC's avatar Shreyas NC Committed by Mark Brown
Browse files

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: default avatarShreyas NC <shreyas.nc@intel.com>
Signed-off-by: default avatarGuneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9149916f

sound/soc/intel/skylake/skl-topology.c

+5 −7
Original line number Diff line number Diff line
@@ -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;