diff options
| author |   Jarkko Nikula <jhnikula@gmail.com> | 2010-12-10 20:54:49 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 16:49:22 +0000 |
| commit | 0f0e25282b93242780a405585a8e3e6f0cc7fa91 (patch) | |
| tree | 34cb986659c0704660c006921ebd58d8bcb96b9c /sound | |
| parent | Merge branch 'for-2.6.37' into for-2.6.38 (diff) | |
| download | linux-dev-0f0e25282b93242780a405585a8e3e6f0cc7fa91.tar.xz linux-dev-0f0e25282b93242780a405585a8e3e6f0cc7fa91.zip | |
ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38
Fix "ASoC: Fix bias power down of non-DAPM codec" for 3.6.37 will cause a
build error when merging into ASoC for-2.6.38. Fix the issue by doing a
change that commit ce6120c "ASoC: Decouple DAPM from CODECs" would do.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
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 45e6a1120cbd..b521a139305a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -982,7 +982,7 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) sys_power = 1; break; case SND_SOC_DAPM_STREAM_STOP: - sys_power = !!codec->active; + sys_power = !!dapm->codec->active; break; case SND_SOC_DAPM_STREAM_SUSPEND: sys_power = 0; |