summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lrg@ti.com>2011-07-24 20:59:37 +0100
committerAndy Green <andy.green@linaro.org>2011-08-25 07:37:54 +0100
commit65a6570fb2c33f871d0395ee2401963170d8acb3 (patch)
treee1b22c2f155fe11b3b5c3e1b06f6fa899423307c /sound
parentb42b18bbc39c5992b1f8d6940e54ae1eaf0285bb (diff)
Subject: [PATCH 054/104] ASoC: dapm - fix list iterator in dapm_seq_run_coalesced.
The list iterator w points to 'pending' list head at the end of list_for_each_entry and not a valid widget. Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-dapm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 54fa2e5e307..b8673ebee04 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -936,6 +936,8 @@ static void dapm_seq_run_coalesced(struct snd_soc_dapm_context *dapm,
"pop test : Applying 0x%x/0x%x to %x in %dms\n",
value, mask, reg, card->pop_time);
pop_wait(card->pop_time);
+ w = list_first_entry(pending, struct snd_soc_dapm_widget,
+ power_list);
soc_widget_update_bits(w, reg, mask, value);
}