]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: Intel: sof_sdw_rt_sdca_jack_common: Use name_prefix for `-sdca` detection
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Mon, 13 May 2024 14:07:30 +0000 (17:07 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 14 May 2024 11:08:51 +0000 (12:08 +0100)
Match against the correct string to decide to add the '-sdca' postfix:
instead of codec_dai->name the correct one is component->name_prefix.

The component->name_prefix is added previously to the card->components as
hs.

Fixes: 9a9d31b149f3 ("ASoC: Intel: sof_sdw_rt_sdca_jack_common: remove -sdca for new codecs")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240513140730.27048-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c

index 701b0372f59e31afc8522382da146e4d29983f97..012195c5051917f23e6f35ccc44018ea3559f252 100644 (file)
@@ -109,7 +109,7 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *d
                return -ENOMEM;
 
        for (i = 0; i < ARRAY_SIZE(need_sdca_suffix); i++) {
-               if (strstr(codec_dai->name, need_sdca_suffix[i])) {
+               if (strstr(component->name_prefix, need_sdca_suffix[i])) {
                        /* Add -sdca suffix for existing UCMs */
                        card->components = devm_kasprintf(card->dev, GFP_KERNEL,
                                                          "%s-sdca", card->components);