Merge branch 'for-3.1' into for-3.2

git-mirror · Aug 17, 2011 · 3d31064 · 3d31064
2 parents 4f7e795 + 25b7679
commit 3d31064
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
@@ -288,6 +288,9 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
 	codec_dai->active--;
 	codec->active--;
 
+	if (!cpu_dai->active && !codec_dai->active)
+		rtd->rate = 0;
+
 	/* Muting the DAC suppresses artifacts caused during digital
 	 * shutdown, for example from stopping clocks.
 	 */