Skip to content

Commit

Permalink
ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jarkko Nikula authored and Mark Brown committed Dec 13, 2010
1 parent 90986dc commit 0f0e252
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0f0e252

Please sign in to comment.