diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-30 14:50:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-30 14:50:37 +0100 |
| commit | 77a9d3eb774f50965106cb2937be660d093a5272 (patch) | |
| tree | 3980b072ee25f01aed7c5e4109983fa7952e6bf7 /sound/soc/soc-dapm.c | |
| parent | e2cd52e60726c30fa558cead7bc7413fd946261c (diff) | |
| parent | e9ff5eb2ae018fe2298c68746c873bf828c6b10e (diff) | |
Merge branch 'fix/asoc' into fix/misc
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d89f6dc0090..66d4c165f99 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -973,9 +973,19 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) if (!w->power_check) continue; - power = w->power_check(w); - if (power) - sys_power = 1; + /* 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); + if (power) + sys_power = 1; + break; + } if (w->power == power) continue; @@ -999,8 +1009,12 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) case SND_SOC_DAPM_STREAM_RESUME: sys_power = 1; break; + case SND_SOC_DAPM_STREAM_SUSPEND: + sys_power = 0; + break; case SND_SOC_DAPM_STREAM_NOP: sys_power = codec->bias_level != SND_SOC_BIAS_STANDBY; + break; default: break; } |