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

Commit de92f6a5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge e73ea1c0 on remote branch 

Change-Id: I6f0d112a847adeb60f72d9948df6511eb8c0d963
parents ea5f88ad e73ea1c0

asoc/msm-pcm-loopback-v2.c

+2 −3
Original line number Diff line number Diff line
@@ -527,9 +527,8 @@ static int msm_pcm_prepare(struct snd_pcm_substream *substream) 
			return -EINVAL;

		}



		ret = q6asm_send_cal(pcm->audio_client);

		if (ret < 0)

			pr_err("%s : Send audio cal failed : %d", __func__, ret);

		if (q6asm_send_cal(pcm->audio_client) < 0)

			pr_info("%s : Send audio cal failed\n", __func__);



		msm_pcm_routing_reg_phy_stream(soc_pcm_tx->dai_link->id,

			pcm->audio_client->perf_mode,

dsp/q6asm.c

+0 −3
Original line number Diff line number Diff line
@@ -5428,7 +5428,6 @@ static int q6asm_enc_cfg_blk_pcm_v5(struct audio_client *ac, 
fail_cmd:

	return rc;

}

EXPORT_SYMBOL(q6asm_enc_cfg_blk_pcm_v5);



/*

 * q6asm_enc_cfg_blk_pcm_v4 - sends encoder configuration parameters
@@ -8884,7 +8883,6 @@ static int q6asm_memory_map_regions(struct audio_client *ac, int dir, 
	mmap_region_cmd = NULL;

	return rc;

}

EXPORT_SYMBOL(q6asm_memory_map_regions);



/**

 * q6asm_memory_unmap_regions -
@@ -8983,7 +8981,6 @@ static int q6asm_memory_unmap_regions(struct audio_client *ac, int dir) 
	}

	return rc;

}

EXPORT_SYMBOL(q6asm_memory_unmap_regions);



int q6asm_set_lrgain(struct audio_client *ac, int left_gain, int right_gain)

{