aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-19 08:49:28 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-20 06:27:10 -0400
commit29376bc7e2bbb745c9ad47e48ca706ac5a24897f (patch)
tree14964d4cf160db701097ed1440d6ca6c2ab1ad26 /sound/soc/soc-dapm.c
parentee8c7e9744882b2cac8886384f156095b12d046d (diff)
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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-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,
918 } 918 }
919 919
920 if (reg >= 0) { 920 if (reg >= 0) {
921 /* Any widget will do, they should all be updating the
922 * same register.
923 */
924 w = list_first_entry(pending, struct snd_soc_dapm_widget,
925 power_list);
926
921 pop_dbg(dapm->dev, card->pop_time, 927 pop_dbg(dapm->dev, card->pop_time,
922 "pop test : Applying 0x%x/0x%x to %x in %dms\n", 928 "pop test : Applying 0x%x/0x%x to %x in %dms\n",
923 value, mask, reg, card->pop_time); 929 value, mask, reg, card->pop_time);