diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-19 10:25:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-19 10:25:26 +0000 |
| commit | 6da37d470b6edbd30aba717b14412973e27c36f3 (patch) | |
| tree | ed8bf0b2af9c8a06f5cd39b71bd4e4606dcf4bfb /sound | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| parent | 7f62b6ee767586ee7e5d12787dbaaaf47a91979a (diff) | |
| download | linux-6da37d470b6edbd30aba717b14412973e27c36f3.tar.gz linux-6da37d470b6edbd30aba717b14412973e27c36f3.tar.bz2 linux-6da37d470b6edbd30aba717b14412973e27c36f3.zip | |
Merge remote-tracking branch 'asoc/fix/core' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 11a90cd027fa..891b9a9bcbf8 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -600,12 +600,13 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) struct snd_soc_platform *platform = rtd->platform; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_codec *codec = rtd->codec; + bool playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); /* apply codec digital mute */ - if (!codec->active) + if ((playback && codec_dai->playback_active == 1) || + (!playback && codec_dai->capture_active == 1)) snd_soc_dai_digital_mute(codec_dai, 1, substream->stream); /* free any machine hw params */ |