Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed May 14, 2014
2 parents 0d1203f + 868a6ca commit cf86197
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/soc-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit cf86197

Please sign in to comment.