summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown2014-05-14 13:52:41 +0200
committerMark Brown2014-05-14 13:52:41 +0200
commitcf86197ec5655ed1f54f1f7ba34a01d576e3737d (patch)
tree9f95ca616e7a789c60a4e6fc17cc85e84bf1c675
parentMerge remote-tracking branch 'asoc/fix/dapm' into asoc-linus (diff)
parentASoC: pcm: Fix incorrect condition check for case SNDRV_PCM_TRIGGER_SUSPEND (diff)
downloadkernel-qcow2-linux-cf86197ec5655ed1f54f1f7ba34a01d576e3737d.tar.gz
kernel-qcow2-linux-cf86197ec5655ed1f54f1f7ba34a01d576e3737d.tar.xz
kernel-qcow2-linux-cf86197ec5655ed1f54f1f7ba34a01d576e3737d.zip
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
-rw-r--r--sound/soc/soc-pcm.c2
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))