Переглянути джерело

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 <broonie@opensource.wolfsonmicro.com>
Tested-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Mark Brown 15 роки тому
батько
коміт
3017358a75
1 змінених файлів з 9 додано та 1 видалено
  1. 9 1
      sound/soc/soc-dapm.c

+ 9 - 1
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))
 		    !path->connected(path->source, path->sink))
 			continue;
 			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)) {
 		    path->sink->power_check(path->sink)) {
 			power = 1;
 			power = 1;
 			break;
 			break;