diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-08 14:29:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-09 07:32:50 -0500 |
commit | 28e868081086c495c897a48c50d2d5187ef677d2 (patch) | |
tree | a7eb8edcf9190899bceacad8fc1f60a14c0424c5 /sound | |
parent | 823dba5191220fc94b83dc0b3f2178ff0842e294 (diff) |
ASoC: Use the correct DAPM context when cleaning up final widget set
Now we've got multi-component we need to make sure that the DAPM context
(and hence register I/O context) we use to apply the pending updates at
the end of a DAPM sequence is the one we were processing rather than the
one that was used to initate the state change.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-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 25e54230cc6a..1790f83ee665 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -941,7 +941,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, | |||
941 | } | 941 | } |
942 | 942 | ||
943 | if (!list_empty(&pending)) | 943 | if (!list_empty(&pending)) |
944 | dapm_seq_run_coalesced(dapm, &pending); | 944 | dapm_seq_run_coalesced(cur_dapm, &pending); |
945 | } | 945 | } |
946 | 946 | ||
947 | static void dapm_widget_update(struct snd_soc_dapm_context *dapm) | 947 | static void dapm_widget_update(struct snd_soc_dapm_context *dapm) |