From: Kuninori Morimoto Date: Fri, 1 Jul 2022 05:18:40 +0000 (+0000) Subject: ASoC: simple-card-utils.c: ignore Codec2Codec setting if it already have X-Git-Tag: v6.0-rc1~93^2~8^2~37^2~2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75d1b39067ed6699ec8a906fa9d83609bca9113b;p=thirdparty%2Fkernel%2Flinux.git ASoC: simple-card-utils.c: ignore Codec2Codec setting if it already have 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 Link: https://lore.kernel.org/r/87bku9s95b.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index a761af6b13b62..b8a3da692ee84 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -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))