From e556bc56043b92ccaf9e1ba97b4be65abc32481a Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 17 Aug 2011 16:34:05 +0900
Subject: [PATCH] --- yaml --- r: 270527 b: refs/heads/master c:
 3d3106433e779cd6d5e4814eaeaec6b79a8ddd53 h: refs/heads/master i:   270525:
 8b0865f4e523575d458f7327e8c9fa55d5260c6c   270523:
 5fe9888219d71c253b85441795abde2849f64757   270519:
 0a1ef44cf289e09a8d45fdd13ae35509d3ffa717   270511:
 bc7072053d0a85866aebb7423e24fd6603c890bc   270495:
 de7ecf54a095d977862e51e9270ce62bd0c70c1d   270463:
 dd99ba8f0792ba0567f064eeee18bc98501b40f7 v: v3

---
 [refs]                    | 2 +-
 trunk/sound/soc/soc-pcm.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3ae0c7952004..8588cf1715e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f7e7954a7f66735b0ee4b304c075c24ffae091a
+refs/heads/master: 3d3106433e779cd6d5e4814eaeaec6b79a8ddd53
diff --git a/trunk/sound/soc/soc-pcm.c b/trunk/sound/soc/soc-pcm.c
index 1347584d64df..1aee9fcdf650 100644
--- a/trunk/sound/soc/soc-pcm.c
+++ b/trunk/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.
 	 */