projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.37' into for-2.6.38
[firefly-linux-kernel-4.4.55.git]
/
sound
/
soc
/
soc-dapm.c
diff --git
a/sound/soc/soc-dapm.c
b/sound/soc/soc-dapm.c
index 9af2d8ad08952487c2f374edb156dcdef7b7edfe..45e6a1120cbd399578fdb896fd9e8eb998f61fae 100644
(file)
--- 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;