Merge branch 'for-2.6.37' into for-2.6.38

git-mirror · Dec 13, 2010 · 90986dc · 90986dc
2 parents 474b9c8 + 862af8a
commit 90986dc
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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;