From 1eee1b3833d67eb52c0f4d293cbb796a776c5eed Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 10 Apr 2012 13:57:46 +0100 Subject: [PATCH] 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 Acked-by: Liam Girdwood --- sound/soc/soc-dapm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c92c537d6be..bda29ccf88f 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 */ -- 2.20.1