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>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 45e6a1120cbd399578fdb896fd9e8eb998f61fae..b521a139305ad7065ec6b55eb6aef910c06f8a5a 100644 (file)
--- 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;