---

yaml --- r: 233548 b: refs/heads/master c: 3017358 h: refs/heads/master v: v3
git-mirror · Feb 13, 2011 · 422ce64 · 422ce64
1 parent 0e44b8b
commit 422ce64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c52fd021bc027a90a10782c0dcf667ac0135e478
+refs/heads/master: 3017358a75917b5ed5ad361c02ba2a7e257d3b2a
diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c
@@ -712,7 +712,15 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
 		    !path->connected(path->source, path->sink))
 			continue;
 
-		if (path->sink && path->sink->power_check &&
+		if (!path->sink)
+			continue;
+
+		if (path->sink->force) {
+			power = 1;
+			break;
+		}
+
+		if (path->sink->power_check &&
 		    path->sink->power_check(path->sink)) {
 			power = 1;
 			break;