Commit 90986dc9 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.37' into for-2.6.38

parents 474b9c86 862af8ad
...@@ -981,6 +981,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) ...@@ -981,6 +981,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
case SND_SOC_DAPM_STREAM_RESUME: case SND_SOC_DAPM_STREAM_RESUME:
sys_power = 1; sys_power = 1;
break; break;
case SND_SOC_DAPM_STREAM_STOP:
sys_power = !!codec->active;
break;
case SND_SOC_DAPM_STREAM_SUSPEND: case SND_SOC_DAPM_STREAM_SUSPEND:
sys_power = 0; sys_power = 0;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment