Commit 8151d5e6 authored Jul 08, 2014 by Benoit Cousson Committed by Mark Brown Jul 16, 2014

ASoC: compress: Prevent multicodec for compressed stream



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

Exit with error if it happens.

Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Tested-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent 44ba2641

sound/soc/soc-compress.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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);