From d2ce23b6e74679013102c8df9491dbedff95acfb Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 10 Apr 2012 13:57:46 +0100
Subject: [PATCH] --- yaml --- r: 305636 b: refs/heads/master c:
 1eee1b3833d67eb52c0f4d293cbb796a776c5eed h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/soc/soc-dapm.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab46069a319f..3e84a639bab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04570c628fbd5ede85d87a0b81bd19df7b13bbc4
+refs/heads/master: 1eee1b3833d67eb52c0f4d293cbb796a776c5eed
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
index c92c537d6be8..bda29ccf88f4 100644
--- a/trunk/sound/soc/soc-dapm.c
+++ b/trunk/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 */