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

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

Merge "ASoC: msm: qdsp6v2: Compress passthrough fixes"

parents 9af303a3 e851c9ae

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

+16 −11
Original line number Diff line number Diff line
@@ -1014,6 +1014,10 @@ static int msm_compr_configure_dsp(struct snd_compr_stream *cstream) 
	if (ret < 0)

		pr_err("%s : Set Volume failed : %d", __func__, ret);



	if (prtd->compr_passthr != LEGACY_PCM) {

		pr_debug("%s : Don't send cal and PP params for compress path",

				__func__);

	} else {

		ret = q6asm_send_cal(ac);

		if (ret < 0)

			pr_debug("%s : Send cal failed : %d", __func__, ret);
@@ -1022,11 +1026,12 @@ static int msm_compr_configure_dsp(struct snd_compr_stream *cstream) 
		if (ret < 0)

			pr_err("%s: Send SoftPause Param failed ret=%d\n",

					__func__, ret);



		ret = q6asm_set_softvolume(ac, &softvol);

		if (ret < 0)

			pr_err("%s: Send SoftVolume Param failed ret=%d\n",

					__func__, ret);



	}

	ret = q6asm_set_io_mode(ac, (COMPRESSED_STREAM_IO | ASYNC_IO_MODE));

	if (ret < 0) {

		pr_err("%s: Set IO mode failed\n", __func__);