]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: simple-card-utils.c: ignore Codec2Codec setting if it already have
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 1 Jul 2022 05:18:40 +0000 (05:18 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 8 Jul 2022 10:51:45 +0000 (11:51 +0100)
Audio Graph Card2 setups own Codec2Codec settings,
but current simple-card-utils.c will try to setup Codec2Codec default
settings if needed, it will overwirtes the settings.
This patch ignores default Codec2Codec settings if it already have.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87bku9s95b.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card-utils.c

index a761af6b13b62b37e9a3e109775e9ddb2ae55699..b8a3da692ee8417c6b38b32b7b6861524cbf62c6 100644 (file)
@@ -527,6 +527,10 @@ static int asoc_simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd,
        struct snd_pcm_hardware hw;
        int i, ret, stream;
 
+       /* Do nothing if it already has Codec2Codec settings */
+       if (dai_link->params)
+               return 0;
+
        /* Only Codecs */
        for_each_rtd_components(rtd, i, component) {
                if (!asoc_simple_component_is_codec(component))