diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 13:11:44 +0000 |
| commit | 941725f5fade7b35394f497c4d684d64a0e05965 (patch) | |
| tree | f18b21c23255446f4ae8e5783b2637af9b6fb98f /sound/soc/soc-pcm.c | |
| parent | 3ee3f454632547a8299c16156c3fefcc2a05726c (diff) | |
| parent | c362effe5cda4df02aa7670d58636ea73979e304 (diff) | |
| download | op-kernel-dev-941725f5fade7b35394f497c4d684d64a0e05965.zip op-kernel-dev-941725f5fade7b35394f497c4d684d64a0e05965.tar.gz | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-pcm.c')
| -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 70e8088..5de2440 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -654,6 +654,8 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) codec_dai->rate = 0; } + snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream); + if (cpu_dai->driver->ops->shutdown) cpu_dai->driver->ops->shutdown(substream, cpu_dai); @@ -772,6 +774,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) for (i = 0; i < rtd->num_codecs; i++) snd_soc_dai_digital_mute(rtd->codec_dais[i], 0, substream->stream); + snd_soc_dai_digital_mute(cpu_dai, 0, substream->stream); out: mutex_unlock(&rtd->pcm_mutex); |
