diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-14 12:52:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-14 12:52:41 +0100 |
| commit | cf86197ec5655ed1f54f1f7ba34a01d576e3737d (patch) | |
| tree | 9f95ca616e7a789c60a4e6fc17cc85e84bf1c675 /sound | |
| parent | 0d1203f29199a1d754bd1ca335c3dc6b14be160b (diff) | |
| parent | 868a6ca84ee7e547ae01a5e04e232e4a392c50b8 (diff) | |
| download | linux-cf86197ec5655ed1f54f1f7ba34a01d576e3737d.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
Diffstat (limited to 'sound')
| -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 2cedf09f6d96..a391de058037 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1675,7 +1675,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP; break; case SNDRV_PCM_TRIGGER_SUSPEND: - if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) + if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) continue; if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream)) |