diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 12:37:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 12:37:42 +0000 |
| commit | 15086ded21ee7f065ad290c1edfdc49cf18cf96e (patch) | |
| tree | 97b509b33d08a83dcd93406acfeccde4f2843ba5 /sound/soc | |
| parent | 3e5ff4dfa5a0a5627235a245665035597f050d86 (diff) | |
| parent | 28e868081086c495c897a48c50d2d5187ef677d2 (diff) | |
| download | op-kernel-dev-15086ded21ee7f065ad290c1edfdc49cf18cf96e.zip op-kernel-dev-15086ded21ee7f065ad290c1edfdc49cf18cf96e.tar.gz | |
Merge branch 'for-2.6.38' into for-2.6.39
Conflicts:
sound/soc/codecs/wm8978.c
sound/soc/soc-dapm.c
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index e981a83..81c4052 100644 --- 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++) |
