diff options
| author | Lu Guanqun <guanqun.lu@intel.com> | 2011-04-06 17:25:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-07 01:25:45 +0200 |
| commit | b04cfcf70b35e032071a6b482273cc642675c8e4 (patch) | |
| tree | 417d9fb51e846a7b6bcff22157be33509b422d19 /sound/soc/soc-core.c | |
| parent | ASoC: Tegra: Suspend/resume support (diff) | |
| download | linux-b04cfcf70b35e032071a6b482273cc642675c8e4.tar.xz linux-b04cfcf70b35e032071a6b482273cc642675c8e4.zip | |
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>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |