summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2011-07-24 20:59:43 +0100
committerAndy Green <andy.green@linaro.org>2011-08-25 07:38:03 +0100
commit63b68b93f480c261bd03f374aea76005b767ed23 (patch)
treea2a1014736ea9065c39b28e7ec9bee0ca5f5c28d /sound
parent4fc60a8a3a79c449d0657c5eee0128cca0c6e57c (diff)
Subject: [PATCH 071/104] ASoC: dsp - Add DSP support to core ASoC API/structures
Export inline DAI PCM operations to allow DSP core to individually call BE PCM operations and .... Allow machine drivers to specifify DSP FE and BE DAI links. Add FE and BE state information to PCM rtd. TODO: split out this into smaller patches. Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index abae40d9544..3d3314185cd 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -781,7 +781,7 @@ find_codec:
/* CODEC found, so find CODEC DAI from registered DAIs from this CODEC*/
list_for_each_entry(codec_dai, &dai_list, list) {
- if (codec->dev == codec_dai->dev &&
+ if ((codec->dev == codec_dai->dev || codec->driver == &null_codec_drv) &&
!strcmp(codec_dai->name, dai_link->codec_dai_name)) {
rtd->codec_dai = codec_dai;
goto find_platform;