ASoC: simple-card-utils.c: ignore Codec2Codec setting if it already have

[sfrench/cifs-2.6.git] / sound / soc / generic / simple-card-utils.c

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index a761af6b13b62b37e9a3e109775e9ddb2ae55699..b8a3da692ee8417c6b38b32b7b6861524cbf62c6 100644 (file)
--- 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))