diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-15 15:02:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-15 15:02:14 +0100 |
| commit | 3da8e6885ec2dea67321c904d721be90e00cd748 (patch) | |
| tree | 3b35758c07907b902d726a053b56646c7d41c5be /sound/soc | |
| parent | c8bf93f0fe8c5a509a29e30f3bac823fa0f6d96e (diff) | |
| parent | 8e8b2d676f3f7c1246b108793fb5690e6c6fcd26 (diff) | |
| download | linux-3da8e6885ec2dea67321c904d721be90e00cd748.tar.gz linux-3da8e6885ec2dea67321c904d721be90e00cd748.tar.bz2 linux-3da8e6885ec2dea67321c904d721be90e00cd748.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
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 d2af872e4771..eaadb4b742f4 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2135,9 +2135,9 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, } } } - mutex_unlock(&codec->mutex); dapm_power_widgets(codec, event); + mutex_unlock(&codec->mutex); dump_dapm(codec, __func__); return 0; } |