Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[cascardo/linux.git] / sound / soc / soc-compress.c

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index f96fb96..27c06ac 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -629,6 +629,11 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
        char new_name[64];
        int ret = 0, direction = 0;
 
+       if (rtd->num_codecs > 1) {
+               dev_err(rtd->card->dev, "Multicodec not supported for compressed stream\n");
+               return -EINVAL;
+       }
+
        /* check client and interface hw capabilities */
        snprintf(new_name, sizeof(new_name), "%s %s-%d",
                        rtd->dai_link->stream_name, codec_dai->name, num);