summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPatrick Lai <plai@codeaurora.org>2012-12-20 03:36:02 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-20 15:59:46 (GMT)
commit08b27848da620f206a8b6d80f26184485dd7aa40 (patch)
tree97afc7bc57dc0b0322b116f98f5372f1a472d91b /sound
parent8246b5b03ef4ab6f29ad8edad859c74b124323cb (diff)
downloadlinux-08b27848da620f206a8b6d80f26184485dd7aa40.tar.xz
ASoC: pcm: allow backend hardware to be freed in pause state
When front-end PCM session is in paused state, back-end PCM session will be put in paused state as well if given front-end PCM session is the only client of given back-end. Then, application closes front-end PCM session, DPCM framework will not allow back-end enters HW_FREE state so back-end will never get shutdown completely. Signed-off-by: Patrick Lai <plai@codeaurora.org> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-pcm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index d7711fc..cf191e6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1243,6 +1243,7 @@ static int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream)
if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_PARAMS) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) &&
+ (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) &&
(be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP))
continue;