evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msm: q6dspv2: use correct variable type to store ION buff size"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-14 21:54:01 -08:00 • committed by Gerrit - the friendly Code Review server
commit 525dda257a
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/msm/qdsp6v2/q6asm.c
View file

@ -3015,7 +3015,8 @@ int q6asm_set_shared_circ_buff(struct audio_client *ac,
int dir)
{
struct audio_buffer *buf_circ;
int bytes_to_alloc, rc, len;
int bytes_to_alloc, rc;
size_t len;
buf_circ = kzalloc(sizeof(struct audio_buffer), GFP_KERNEL);
@ -3034,7 +3035,7 @@ int q6asm_set_shared_circ_buff(struct audio_client *ac,
rc = msm_audio_ion_alloc("audio_client", &buf_circ->client,
&buf_circ->handle, bytes_to_alloc,
(ion_phys_addr_t *)&buf_circ->phys,
(size_t *)&len, &buf_circ->data);
&len, &buf_circ->data);
if (rc) {
pr_err("%s: Audio ION alloc is failed, rc = %d\n", __func__,
@ -3076,7 +3077,8 @@ int q6asm_set_shared_pos_buff(struct audio_client *ac,
int dir)
{
struct audio_buffer *buf_pos = &ac->shared_pos_buf;
int len, rc;
int rc;
size_t len;
int bytes_to_alloc = sizeof(struct asm_shared_position_buffer);
mutex_lock(&ac->cmd_lock);
@ -3085,7 +3087,7 @@ int q6asm_set_shared_pos_buff(struct audio_client *ac,
rc = msm_audio_ion_alloc("audio_client", &buf_pos->client,
&buf_pos->handle, bytes_to_alloc,
(ion_phys_addr_t *)&buf_pos->phys, (size_t *)&len,
(ion_phys_addr_t *)&buf_pos->phys, &len,
&buf_pos->data);
if (rc) {

2
sound/soc/msm/qdsp6v2/q6voice.h
View file

@ -142,7 +142,7 @@ struct share_mem_buf {
struct mem_map_table {
dma_addr_t phys;
void *data;
uint32_t size; /* size of buffer */
size_t size; /* size of buffer */
struct ion_handle *handle;
struct ion_client *client;
};