diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-05-12 08:12:05 -0400 |
|---|---|---|
| committer | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-06-19 05:06:28 -0400 |
| commit | 48dbccdb017195c8a2fba6cc5e5b103f2a20e3e5 (patch) | |
| tree | f9b0b7abc5b67036740b78574474995cc5fae96b | |
| parent | 084fea9f50c553a6f70aac51378569d994e5ed07 (diff) | |
ASoC: pcm: Fix incorrect condition check for case SNDRV_PCM_TRIGGER_SUSPEND
The regular state before we execute SNDRV_PCM_TRIGGER_SUSPEND should be
SNDRV_PCM_TRIGGER_START, not SNDRV_PCM_TRIGGER_STOP. Thus fix it.
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from commit 868a6ca84ee7e547ae01a5e04e232e4a392c50b8)
| -rw-r--r-- | sound/soc/soc-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 36fe8b365c5a..7db60b46e01d 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
| @@ -1566,7 +1566,7 @@ static int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, | |||
| 1566 | be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP; | 1566 | be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP; |
| 1567 | break; | 1567 | break; |
| 1568 | case SNDRV_PCM_TRIGGER_SUSPEND: | 1568 | case SNDRV_PCM_TRIGGER_SUSPEND: |
| 1569 | if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) | 1569 | if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) |
| 1570 | continue; | 1570 | continue; |
| 1571 | 1571 | ||
| 1572 | if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream)) | 1572 | if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream)) |