summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-10 13:57:46 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-16 19:36:29 +0100
commit1eee1b3833d67eb52c0f4d293cbb796a776c5eed (patch)
treecce8952552bde1f417fab6c759a4434f97e98f18 /sound/soc/soc-dapm.c
parent04570c628fbd5ede85d87a0b81bd19df7b13bbc4 (diff)
downloadlinux-1eee1b3833d67eb52c0f4d293cbb796a776c5eed.tar.gz
linux-1eee1b3833d67eb52c0f4d293cbb796a776c5eed.tar.bz2
linux-1eee1b3833d67eb52c0f4d293cbb796a776c5eed.zip
ASoC: dapm: Allow DAI widgets to be routed through
In order to allow CODEC<->CODEC links to function we will need to allow DAPM paths to be created that pass through DAIs rather than only ones that are source or sunk at the DAI. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index c92c537d6be8..bda29ccf88f4 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -923,7 +923,10 @@ static int dapm_dai_check_power(struct snd_soc_dapm_widget *w)
{
DAPM_UPDATE_STAT(w, power_checks);
- return w->active;
+ if (w->active)
+ return w->active;
+
+ return dapm_generic_check_power(w);
}
/* Check to see if an ADC has power */