summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorChandrakanth Gorantla <cgorantla@nvidia.com>2014-04-25 19:19:57 +0530
committerRiham Haidar <rhaidar@nvidia.com>2014-05-20 13:35:35 -0700
commit97fdd73057b273016fc87a7413fca561c7c0f814 (patch)
tree3da25812c1bbb64493a9f13d0de184f437858ba1 /sound
parent82b86baec05c2d68bbcd1b05bc8685b1d5b6548e (diff)
ASOC: DPCM: Allow pause state as prev state for stop state
In case of seek, pause <-> stop <-> resume is the general sequence, so allow pause state to come before stop. Bug 1405523 Change-Id: Ib90d5c6cb780bdb5c9cedd33ae114f78603b2649 Signed-off-by: Chandrakanth Gorantla <cgorantla@nvidia.com> Reviewed-on: http://git-master/r/401556 Reviewed-by: Deepa Madiregama <dmadiregama@nvidia.com> Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-pcm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index e1925aba662e..9a93befa6d2e 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1463,7 +1463,8 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream,
be->dpcm[stream].state = SND_SOC_DPCM_STATE_START;
break;
case SNDRV_PCM_TRIGGER_STOP:
- if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)
+ if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) &&
+ (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))
continue;
if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))