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

Commit f0637907 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: qdsp6v2: Flush record session during stop"

parents b125ec87 826d9d85

sound/soc/msm/qdsp6v2/msm-pcm-q6-v2.c

+3 −0
Original line number Diff line number Diff line
@@ -517,6 +517,9 @@ static int msm_pcm_trigger(struct snd_pcm_substream *substream, int cmd) 
		if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK) {

			prtd->enabled = STOPPED;

			ret = q6asm_cmd_nowait(prtd->audio_client, CMD_PAUSE);

			if (!ret)

				ret = q6asm_cmd_nowait(prtd->audio_client,

					CMD_FLUSH);

			break;

		}

		/* pending CMD_EOS isn't expected */

sound/soc/msm/qdsp6v2/q6asm.c

+4 −0
Original line number Diff line number Diff line
@@ -7263,6 +7263,10 @@ static int __q6asm_cmd_nowait(struct audio_client *ac, int cmd, 
		pr_debug("%s: CMD_PAUSE\n", __func__);

		hdr.opcode = ASM_SESSION_CMD_PAUSE;

		break;

	case CMD_FLUSH:

		pr_debug("%s: CMD_FLUSH\n", __func__);

		hdr.opcode = ASM_STREAM_CMD_FLUSH;

		break;

	case CMD_EOS:

		pr_debug("%s: CMD_EOS\n", __func__);

		hdr.opcode = ASM_DATA_CMD_EOS;