[alsa-devel] [PATCH v6 4/5] ASoC: compress: Prevent multicodec for compressed stream

Benoit Cousson bcousson at baylibre.com
Tue Jul 8 23:19:37 CEST 2014


Multiple codecs does not make sense in the case of compressed
stream.

Exit with error if it happens.

Signed-off-by: Benoit Cousson <bcousson at baylibre.com>
Tested-by: Lars-Peter Clausen <lars at metafoo.de>
Reviewed-by: Lars-Peter Clausen <lars at metafoo.de>
Acked-by: Vinod Koul <vinod.koul at intel.com>
---
 sound/soc/soc-compress.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index f96fb96..27c06ac 100644
--- 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);
-- 
1.9.1



More information about the Alsa-devel mailing list