Unverified Commit 1c0d023c authored by Ranjani Sridharan's avatar Ranjani Sridharan Committed by Mark Brown
Browse files

ASoC: SOF: topology: Fix tuples array allocation 



The memory allocated for the tuples array assumes that there's 1
instance of all tokens already. So for those tokens that have multiple
instances in topology, we need to exclude the initial instance that has
already been accounted for.

Fixes: 4fdef47a ("ASoC: SOF: ipc4-topology: Add new tokens for input/output pin format count")
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20230515085200.17094-1-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent be3c2153

sound/soc/sof/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ static int sof_widget_parse_tokens(struct snd_soc_component *scomp, struct snd_s 
		if (num_sets > 1) {

			struct snd_sof_tuple *new_tuples;



			num_tuples += token_list[object_token_list[i]].count * num_sets;

			num_tuples += token_list[object_token_list[i]].count * (num_sets - 1);

			new_tuples = krealloc(swidget->tuples,

					      sizeof(*new_tuples) * num_tuples, GFP_KERNEL);

			if (!new_tuples) {