summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-19 13:49:28 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-20 11:27:10 +0100
commit29376bc7e2bbb745c9ad47e48ca706ac5a24897f (patch)
tree14964d4cf160db701097ed1440d6ca6c2ab1ad26
parentee8c7e9744882b2cac8886384f156095b12d046d (diff)
downloadlinux-stable-29376bc7e2bbb745c9ad47e48ca706ac5a24897f.tar.gz
linux-stable-29376bc7e2bbb745c9ad47e48ca706ac5a24897f.tar.bz2
linux-stable-29376bc7e2bbb745c9ad47e48ca706ac5a24897f.zip
ASoC: Fix DAPM sequence run for per-widget I/O methods
Previously we were using the DAPM context rather than a widget as the argument for update_bits() so we didn't need to care that our list walk of widgets left us one beyond the end of the list. Now we're using them for the register update we need to make sure we're pointing at an actual widget not the list_head. Fix originally suggested by Liam on IM. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
-rw-r--r--sound/soc/soc-dapm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 605c225c709a..ceb2ba44fd3f 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -918,6 +918,12 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm,
}
if (reg >= 0) {
+ /* Any widget will do, they should all be updating the
+ * same register.
+ */
+ w = list_first_entry(pending, struct snd_soc_dapm_widget,
+ power_list);
+
pop_dbg(dapm->dev, card->pop_time,
"pop test : Applying 0x%x/0x%x to %x in %dms\n",
value, mask, reg, card->pop_time);