From 422ce64af87fa2b97658b75a596cbdc4c9571cb8 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 11 Feb 2011 11:42:19 +0000
Subject: [PATCH] --- yaml --- r: 233548 b: refs/heads/master c:
 3017358a75917b5ed5ad361c02ba2a7e257d3b2a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 92ef34d223d2..afe777c07331 100644
--- 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
index 4df96ec9a813..25e54230cc6a 100644
--- 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;