---

yaml --- r: 305636 b: refs/heads/master c: 1eee1b3 h: refs/heads/master v: v3
git-mirror · Apr 16, 2012 · d2ce23b · d2ce23b
1 parent 33afafb
commit d2ce23b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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 */