Merge "ASoC: msm: compr_free(), check if EOS is going on before waiting" into msm-4.8 (07b8a8e3) · Commits · e / devices / android_kernel_fairphone_FP3

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -455,10 +455,12 @@ static int msm_compr_free(struct snd_compr_stream *cstream)
		pr_debug("%s: ocmem_req: %d\n", __func__,
		atomic_read(&pdata->audio_ocmem_req));

		if (atomic_read(&prtd->eos)) {
		ret = wait_event_timeout(prtd->eos_wait,
		prtd->cmd_ack, 5 * HZ);
		if (!ret)
		pr_err("%s: CMD_EOS failed\n", __func__);
		}

		q6asm_cmd(prtd->audio_client, CMD_CLOSE);