Merge branch 'for-2.6.38' into for-2.6.39

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index e981a8339f88ce07f041bdc0e258ef90d57f58fa..81c4052c127ccc150a63ca50780ddcc9357f25f7 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1007,7 +1007,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
        }
 
        if (!list_empty(&pending))
-               dapm_seq_run_coalesced(dapm, &pending);
+               dapm_seq_run_coalesced(cur_dapm, &pending);
 
        if (cur_dapm && cur_dapm->seq_notifier) {
                for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)