From: Lu Guanqun <guanqun.lu@intel.com>
Date: Wed, 6 Apr 2011 15:25:11 +0000 (+0800)
Subject: ASoC: check channel mismatch between cpu_dai and codec_dai
X-Git-Tag: MMI-PSA29.97-13-9~19774^2~29
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b04cfcf70b35e032071a6b482273cc642675c8e4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ASoC: check channel mismatch between cpu_dai and codec_dai

Suppose we have:

	cpu_dai
		channels_min = 1
		channels_max = 1

	codec_dai
		channels_min = 2
		channels_max = 2

This is a mismatch that should not happen, however according to the current
code, the result of runtime->hw will be:

		channels_min = 2
		channels_max = 1

We better spot it early. This patch checks this mismatch.

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 960718b3beb8..4f42fef26c98 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -640,7 +640,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
 			codec_dai->name, cpu_dai->name);
 		goto config_err;
 	}
-	if (!runtime->hw.channels_min || !runtime->hw.channels_max) {
+	if (!runtime->hw.channels_min || !runtime->hw.channels_max ||
+	    runtime->hw.channels_min > runtime->hw.channels_max) {
 		printk(KERN_ERR "asoc: %s <-> %s No matching channels\n",
 				codec_dai->name, cpu_dai->name);
 		goto config_err;