ASoC: Ensure supplies are maintained for force enabled widgets

If a widget has been force enabled then not only do we need to keep the widget itself enabled, we also need to keep any supplies the widget requires enabled. The user could force all the individual widgets on but this requires too much knowledge of device internals. Signed-off-by: Mark Brown <[email protected]> Tested-by: Stephen Warren <[email protected]> Acked-by: Liam Girdwood <[email protected]>
cbmeeks · Feb 13, 2011 · 3017358 · 3017358
1 parent c52fd02
commit 3017358
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/sound/soc/soc-dapm.c b/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;