Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus

cf86197e · Mark Brown · 0d1203f2 · 868a6ca8 · cf86197e
Commit cf86197e authored May 14, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/soc-pcm.c sound/soc/soc-pcm.c +1 -1

No files found.
--- 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))