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

Commit 9a96ba0a 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: Change client names for ion alloc"

parents 694b08a1 0ec8edd3

sound/soc/msm/qdsp6v2/q6afe.c

+1 −1
Original line number Diff line number Diff line
@@ -2409,7 +2409,7 @@ int q6afe_audio_client_buf_alloc_contiguous(unsigned int dir, 


	ac->port[dir].buf = buf;



	rc = msm_audio_ion_alloc("audio_client", &buf[0].client,

	rc = msm_audio_ion_alloc("afe_client", &buf[0].client,

				&buf[0].handle, bufsz*bufcnt,

				&buf[0].phys, &len,

				&buf[0].data);

sound/soc/msm/qdsp6v2/q6asm.c

+2 −2
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ int q6asm_audio_client_buf_alloc(unsigned int dir, 
		while (cnt < bufcnt) {

			if (bufsz > 0) {

				if (!buf[cnt].data) {

					msm_audio_ion_alloc("audio_client",

					msm_audio_ion_alloc("asm_client",

					&buf[cnt].client, &buf[cnt].handle,

					      bufsz,

					      (ion_phys_addr_t *)&buf[cnt].phys,
@@ -1189,7 +1189,7 @@ int q6asm_audio_client_buf_alloc_contiguous(unsigned int dir, 
	/* The size to allocate should be multiple of 4K bytes */

	bytes_to_alloc = PAGE_ALIGN(bytes_to_alloc);



	rc = msm_audio_ion_alloc("audio_client", &buf[0].client, &buf[0].handle,

	rc = msm_audio_ion_alloc("asm_client", &buf[0].client, &buf[0].handle,

		bytes_to_alloc,

		(ion_phys_addr_t *)&buf[0].phys, (size_t *)&len,

		&buf[0].data);