diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 08:36:05 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 08:36:05 +0100 |
commit | ef47bf386e2042c2e483b4ea0259233202ad3ebf (patch) | |
tree | 02baba407d2dbae9d367865c3d52d6e9400c8773 /sound/soc/soc-dapm.c | |
parent | 306ecee926cf79f1b3b5f6035be09ef3d83f1b76 (diff) | |
parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) |
Merge branch 'fix/misc' into topic/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; } |