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

Commit f01fa314 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: Avoid putting stream state to STOP when stream paused" into msm-4.8

parents 99d18eb5 6175bce6

sound/soc/soc-pcm.c

+3 −1
Original line number Diff line number Diff line
@@ -2184,9 +2184,11 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd) 
		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

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

		break;

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PAUSED;

		break;

	}



out: