提交 0f0e2528 编写于 作者: J Jarkko Nikula 提交者: Mark Brown

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 ce6120cc "ASoC: Decouple DAPM from CODECs" would do.
Signed-off-by: NJarkko Nikula <jhnikula@gmail.com>
Acked-by: NLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 90986dc9
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册