Merge branch 'for-2.6.37' into for-2.6.38

This commit is contained in:
Mark Brown 2010-12-13 16:48:38 +00:00
commit 90986dc98d

View file

@ -981,6 +981,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
case SND_SOC_DAPM_STREAM_RESUME:
sys_power = 1;
break;
case SND_SOC_DAPM_STREAM_STOP:
sys_power = !!codec->active;
break;
case SND_SOC_DAPM_STREAM_SUSPEND:
sys_power = 0;
break;