diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 16:48:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-13 16:48:38 +0000 |
| commit | 90986dc98d71242e764e1f98017c041511e1c3b1 (patch) | |
| tree | 006488f1b82c8d645510a8718b2f2875b9c15e54 /sound/soc/soc-dapm.c | |
| parent | 474b9c86b0c65e9ca6a77d8b7bf132c4d5993b9c (diff) | |
| parent | 862af8adbe6b9ccb7c00c13717b1f92465f79aa2 (diff) | |
| download | linux-90986dc98d71242e764e1f98017c041511e1c3b1.tar.gz linux-90986dc98d71242e764e1f98017c041511e1c3b1.tar.bz2 linux-90986dc98d71242e764e1f98017c041511e1c3b1.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9af2d8ad0895..45e6a1120cbd 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -981,6 +981,9 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) case SND_SOC_DAPM_STREAM_RESUME: sys_power = 1; break; + case SND_SOC_DAPM_STREAM_STOP: + sys_power = !!codec->active; + break; case SND_SOC_DAPM_STREAM_SUSPEND: sys_power = 0; break; |