ASoC: Intel: avs: Fix dynamic port assignment when TDM is set

Amadeusz Sławiński · broonie · commit 44d3b8a19b91 · 2024-02-07T15:23:49.000Z
In case TDM is set in topology on SSP0, parser will overwrite vindex value, because it only checks if port is set. Fix this by checking whole field value. Fixes: e6d50e4 ("ASoC: Intel: avs: Improve topology parsing of dynamic strings") Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20240207112624.2132821-1-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c
@@ -857,7 +857,7 @@ assign_copier_gtw_instance(struct snd_soc_component *comp, struct avs_tplg_modcf
 	}
 
 	/* If topology sets value don't overwrite it */
-	if (cfg->copier.vindex.i2s.instance)
+	if (cfg->copier.vindex.val)
 		return;
 
 	mach = dev_get_platdata(comp->card->dev);

Original file line number	Diff line number	Diff line change
`@@ -857,7 +857,7 @@ assign_copier_gtw_instance(struct snd_soc_component *comp, struct avs_tplg_modcf`
`857`	`857`	`}`
`858`	`858`
`859`	`859`	`/* If topology sets value don't overwrite it */`
`860`		`- if (cfg->copier.vindex.i2s.instance)`
	`860`	`+ if (cfg->copier.vindex.val)`
`861`	`861`	`return;`
`862`	`862`
`863`	`863`	`mach = dev_get_platdata(comp->card->dev);`