adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-2.6.32' into for-2.6.33

Browse source
This commit is contained in:
Mark Brown 2009-11-23 13:37:04 +00:00
commit 97cef58521
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sound/soc/soc-dapm.c
View file

@ -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;
power = w->power_check(w); /* If we're suspending then pull down all the
if (power) * power. */
sys_power = 1; switch (event) {
case SND_SOC_DAPM_STREAM_SUSPEND:
power = 0;
break;
default:
power = w->power_check(w);
if (power)
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)
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;
} }