diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-20 17:29:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-09 08:31:28 -0700 |
| commit | a73185355e3d19694b655528811e54cc086a5bcf (patch) | |
| tree | 8f4c6444dc102c6be87e840ba968fdfb5dad13bc /sound | |
| parent | 0706b27d2ff206bdbeb457a56944ca372e6a9d8e (diff) | |
| download | linux-stable-a73185355e3d19694b655528811e54cc086a5bcf.tar.gz linux-stable-a73185355e3d19694b655528811e54cc086a5bcf.tar.bz2 linux-stable-a73185355e3d19694b655528811e54cc086a5bcf.zip | |
ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
commit 0ff97ebf0804d2e519d578fcb4db03f104d2ca8c upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -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 1bb6d4a63cd8..c41efe01a819 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1442,7 +1442,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; |