Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04cfcf7 authored by Lu Guanqun's avatar Lu Guanqun Committed by Mark Brown
Browse files

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: default avatarLu Guanqun <guanqun.lu@intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent deb2607e

sound/soc/soc-core.c

+2 −1
Original line number Diff line number Diff line
@@ -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;