diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-20 16:29:34 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-23 09:39:54 (GMT) |
| commit | 0ff97ebf0804d2e519d578fcb4db03f104d2ca8c (patch) | |
| tree | 865b72a3b646671a6cd7be3f3aafe5a64f5173f7 | |
| parent | 409b78cc17a4a3d07a541037575da648ced99437 (diff) | |
| download | linux-0ff97ebf0804d2e519d578fcb4db03f104d2ca8c.tar.xz | |
ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
Ever since the DAPM performance improvements we've been marking all widgets
as not dirty after each DAPM run. Since _PRE and _POST events aren't part
of the DAPM graph this has rendered them non-functional, they will never be
marked dirty again and thus will never be run again.
Fix this by skipping them when marking widgets as not dirty.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | sound/soc/soc-dapm.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f7a13f7..025060b 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1598,7 +1598,15 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) } list_for_each_entry(w, &card->widgets, list) { - list_del_init(&w->dirty); + switch (w->id) { + case snd_soc_dapm_pre: + case snd_soc_dapm_post: + /* These widgets always need to be powered */ + break; + default: + list_del_init(&w->dirty); + break; + } if (w->power) { d = w->dapm; |