ASoC: dapm: Allow DAI widgets to be routed through
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Apr 2012 12:57:46 +0000 (13:57 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 16 Apr 2012 18:36:29 +0000 (19:36 +0100)
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>
sound/soc/soc-dapm.c

index c92c537d6be8ec02cba61fa8b7cb573d7b8f4d66..bda29ccf88f4bf9b31a71eb52fd62fe7e3de2a2f 100644 (file)
@@ -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 */