Merge "ASoC: msm: Disable sending ASM cal when in NT mode" (87113a18) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/q6asm.c

+14 −8

Original line number	Diff line number	Diff line
		@@ -2748,10 +2748,13 @@ int q6asm_run(struct audio_client *ac, uint32_t flags,
		return -EINVAL;
		}
		pr_debug("%s: session[%d]\n", __func__, ac->session);
		if (!(ac->io_mode & NT_MODE)) {
		rc = q6asm_send_asm_cal(ac);
		if (rc < 0) {
		/* This is not fatal error to stop, no return is required */
		pr_info("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);
		/* This is not fatal error no return required */
		pr_info("%s: q6asm_send_asm_cal ret=%d\n",
		__func__, rc);
		}
		}

		q6asm_add_hdr(ac, &run.hdr, sizeof(run), TRUE);
		@@ -2809,10 +2812,13 @@ static int __q6asm_run_nowait(struct audio_client *ac, uint32_t flags,
		return -EINVAL;
		}
		pr_debug("%s: session[%d]\n", __func__, ac->session);
		if (!(ac->io_mode & NT_MODE)) {
		rc = q6asm_send_asm_cal_nowait(ac);
		if (rc < 0) {
		/* This is not fatal error to stop, no return is required */
		pr_info("%s: q6asm_send_asm_cal ret=%d\n", __func__, rc);
		/* This is not fatal error no return required */
		pr_info("%s: q6asm_send_asm_cal ret=%d\n",
		__func__, rc);
		}
		}

		q6asm_stream_add_hdr_async(ac, &run.hdr, sizeof(run), TRUE, stream_id);