diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-17 03:34:05 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-17 03:34:05 -0400 |
| commit | 3d3106433e779cd6d5e4814eaeaec6b79a8ddd53 (patch) | |
| tree | 6f03bd66d8a97eff7238c83d24a24766073305fc /sound | |
| parent | 4f7e7954a7f66735b0ee4b304c075c24ffae091a (diff) | |
| parent | 25b7679136fd85b1e5197e36a0ca126163e89590 (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-pcm.c | 3 |
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) | |||
| 288 | codec_dai->active--; | 288 | codec_dai->active--; |
| 289 | codec->active--; | 289 | codec->active--; |
| 290 | 290 | ||
| 291 | if (!cpu_dai->active && !codec_dai->active) | ||
| 292 | rtd->rate = 0; | ||
| 293 | |||
| 291 | /* Muting the DAC suppresses artifacts caused during digital | 294 | /* Muting the DAC suppresses artifacts caused during digital |
| 292 | * shutdown, for example from stopping clocks. | 295 | * shutdown, for example from stopping clocks. |
| 293 | */ | 296 | */ |