Commit 97cef585 authored by Mark Brown's avatar Mark Brown

Merge branch 'for-2.6.32' into for-2.6.33

parents dcdec639 50b6bce5
...@@ -977,9 +977,19 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) ...@@ -977,9 +977,19 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event)
if (!w->power_check) if (!w->power_check)
continue; continue;
/* If we're suspending then pull down all the
* power. */
switch (event) {
case SND_SOC_DAPM_STREAM_SUSPEND:
power = 0;
break;
default:
power = w->power_check(w); power = w->power_check(w);
if (power) if (power)
sys_power = 1; sys_power = 1;
break;
}
if (w->power == power) if (w->power == power)
continue; continue;
...@@ -1003,8 +1013,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) ...@@ -1003,8 +1013,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, 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_SUSPEND:
sys_power = 0;
break;
case SND_SOC_DAPM_STREAM_NOP: case SND_SOC_DAPM_STREAM_NOP:
sys_power = codec->bias_level != SND_SOC_BIAS_STANDBY; sys_power = codec->bias_level != SND_SOC_BIAS_STANDBY;
break;
default: default:
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