Commit 15086ded authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.38' into for-2.6.39

Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c
parents 3e5ff4df 28e86808
......@@ -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++)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment