| commit | cf86197ec5655ed1f54f1f7ba34a01d576e3737d | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Wed May 14 12:52:41 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Wed May 14 12:52:41 2014 +0100 |
| tree | 9f95ca616e7a789c60a4e6fc17cc85e84bf1c675 | |
| parent | 0d1203f29199a1d754bd1ca335c3dc6b14be160b [diff] | |
| parent | 868a6ca84ee7e547ae01a5e04e232e4a392c50b8 [diff] |
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2cedf09..a391de0 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c
@@ -1675,7 +1675,7 @@ 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))