Commit ea77b947 authored May 26, 2011 by Jarkko Nikula Committed by Mark Brown May 26, 2011

ASoC: Fix power down for widgetless per-card DAPM context case



Commit 52ba67bf ("ASoC: Force all DAPM contexts into the same bias state")
powers up all the DAPM contexts in a card if any DAPM context becomes
active. Unfortunately power down newer happens if per-card DAPM context
doesn't have any widgets.

Reason for this is that power state of per-card DAPM context without
widgets is never cleared and thus all the DAPM contexts remain permanently
active. Test for widgetless calling DAPM context in dapm_power_widgets()
doesn't work for per-card DAPM context since power change is never
originating from widgetless per-card DAPM context.

Fix this by pre-clearing power state flag of non-codec DAPM context at the
beginning of power sequence.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 979f4869

sound/soc/soc-dapm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1110,7 +1110,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
		trace_snd_soc_dapm_start(card);

		list_for_each_entry(d, &card->dapm_list, list)
		if (d->n_widgets)
		if (d->n_widgets \|\| d->codec == NULL)
		d->dev_power = 0;

		/* Check which widgets we need to power and store them in