OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent 474b9c86b0 862af8adbe
commit 90986dc98d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/soc-dapm.c
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;