summaryrefslogtreecommitdiff
path: root/sound/soc/soc-pcm.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-17 11:34:05 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-17 11:34:05 +0400
commit3d3106433e779cd6d5e4814eaeaec6b79a8ddd53 (patch)
tree6f03bd66d8a97eff7238c83d24a24766073305fc /sound/soc/soc-pcm.c
parent4f7e7954a7f66735b0ee4b304c075c24ffae091a (diff)
parent25b7679136fd85b1e5197e36a0ca126163e89590 (diff)
downloadlinux-3d3106433e779cd6d5e4814eaeaec6b79a8ddd53.tar.xz
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r--sound/soc/soc-pcm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 1347584d64df..1aee9fcdf650 100644
--- 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.
*/