Merge branch 'for-2.6.37' into for-2.6.38

90986dc9 · Mark Brown · 474b9c86 · 862af8ad · 90986dc9
Commit 90986dc9 authored Dec 13, 2010 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sound/soc/soc-dapm.c sound/soc/soc-dapm.c +3 -0

No files found.
--- 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;