From: Amadeusz Sławiński Date: Wed, 7 Feb 2024 11:26:24 +0000 (+0100) Subject: ASoC: Intel: avs: Fix dynamic port assignment when TDM is set X-Git-Tag: v6.7.6~289 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45e9ed0dea611b3fae1acb07f787bdcca6611a88;p=thirdparty%2Fkernel%2Fstable.git ASoC: Intel: avs: Fix dynamic port assignment when TDM is set [ Upstream commit 44d3b8a19b91cd2af11f918b2fd05628383172de ] 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: e6d50e474e45 ("ASoC: Intel: avs: Improve topology parsing of dynamic strings") Reviewed-by: Cezary Rojewski Signed-off-by: Amadeusz Sławiński Link: https://lore.kernel.org/r/20240207112624.2132821-1-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c index c74e9d622e4c6..41020409ffb60 100644 --- 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);