Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf86197e authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 0d1203f2 868a6ca8

sound/soc/soc-pcm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

			be->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP;

			break;

			break;

		case SNDRV_PCM_TRIGGER_SUSPEND:

		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;

				continue;





			if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))

			if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))