From f99bcb75f1ff5d252070e494ab78bcedfaf6bdeb Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Fri, 10 Dec 2010 20:53:55 +0200 Subject: [PATCH] --- yaml --- r: 223373 b: refs/heads/master c: 862af8adbe6b9ccb7c00c13717b1f92465f79aa2 h: refs/heads/master i: 223371: 04c8d1b495f951f3622b807ff7c5e38a774c9b35 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-dapm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2e2aedc7075e..a908b5c527e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0968628097380be52db8b4664da98fc425546a5 +refs/heads/master: 862af8adbe6b9ccb7c00c13717b1f92465f79aa2 diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 75ed6491222d..c721502833bc 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/sound/soc/soc-dapm.c @@ -944,6 +944,9 @@ 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_STOP: + sys_power = !!codec->active; + break; case SND_SOC_DAPM_STREAM_SUSPEND: sys_power = 0; break;