aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-28 18:23:53 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-04 16:50:18 +0100
commit35c64bcad5c8244d973efbf7e58f6e0e09635504 (patch)
tree7a6803cfe34232f20793fbae86fd1e8593f0bf6f /sound/soc/soc-dapm.c
parentf9de6d741d246583a8fdcf212cf14456a1622ce1 (diff)
ASoC: Ensure all DAPM widgets have a power check callback
Makes the code simpler. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 12bd01a1863..8d760449965 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -857,6 +857,11 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
return power;
}
+static int dapm_always_on_check_power(struct snd_soc_dapm_widget *w)
+{
+ return 1;
+}
+
static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
struct snd_soc_dapm_widget *b,
bool power_up)
@@ -1229,9 +1234,6 @@ static void dapm_power_one_widget(struct snd_soc_dapm_widget *w,
break;
default:
- if (!w->power_check)
- break;
-
if (!w->force)
power = w->power_check(w);
else
@@ -2090,6 +2092,9 @@ int snd_soc_dapm_new_widgets(struct snd_soc_dapm_context *dapm)
break;
}
+ if (!w->power_check)
+ w->power_check = dapm_always_on_check_power;
+
/* Read the initial power state from the device */
if (w->reg >= 0) {
val = soc_widget_read(w, w->reg);