From c416519569c51437a0f4bbfd0e1a4ff8bcd58279 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 13 Dec 2010 16:48:38 +0000 Subject: [PATCH] --- yaml --- r: 230375 b: refs/heads/master c: 90986dc98d71242e764e1f98017c041511e1c3b1 h: refs/heads/master i: 230373: 53f11d4c31d676a581b30058317548d717e06235 230371: 6db68d7a2310c9e26458e9fff9b810dfdc68cc5e 230367: c3e6aa3a2483a711b360753430a1f79939a2e365 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 f397efcbd418..0e59e577bc86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 474b9c86b0c65e9ca6a77d8b7bf132c4d5993b9c +refs/heads/master: 90986dc98d71242e764e1f98017c041511e1c3b1 diff --git a/trunk/sound/soc/soc-dapm.c b/trunk/sound/soc/soc-dapm.c index 9af2d8ad0895..45e6a1120cbd 100644 --- a/trunk/sound/soc/soc-dapm.c +++ b/trunk/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;