Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-2.6.38' into for-2.6.39

Browse source 
Conflicts:
	sound/soc/codecs/wm8978.c
	sound/soc/soc-dapm.c
This commit is contained in:
Mark Brown 2011-03-09 12:37:42 +00:00
commit 15086ded21
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/soc-dapm.c
View file

@ -1007,7 +1007,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm,
} }
if (!list_empty(&pending)) if (!list_empty(&pending))
dapm_seq_run_coalesced(dapm, &pending); dapm_seq_run_coalesced(cur_dapm, &pending);
if (cur_dapm && cur_dapm->seq_notifier) { if (cur_dapm && cur_dapm->seq_notifier) {
for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++) for (i = 0; i < ARRAY_SIZE(dapm_up_seq); i++)