A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "dsp: msm_audio_ion: unmap dma only if unmap kernel succeeds"

Browse source
This commit is contained in:
Linux Build Service Account 2018-10-23 01:32:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit 28267437a4
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dsp/msm_audio_ion.c
View file

@ -279,7 +279,7 @@ exit:
return addr;
}
static void msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf)
static int msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf)
{
int rc = 0;
void *vaddr = NULL;
@ -304,6 +304,7 @@ static void msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf)
dev_err(cb_dev,
"%s: cannot find allocation for dma_buf %pK",
__func__, dma_buf);
rc = -EINVAL;
goto err;
}
@ -317,7 +318,7 @@ static void msm_audio_ion_unmap_kernel(struct dma_buf *dma_buf)
}
err:
return;
return rc;
}
static int msm_audio_ion_map_buf(struct dma_buf *dma_buf, dma_addr_t *paddr,
@ -489,12 +490,16 @@ EXPORT_SYMBOL(msm_audio_ion_import);
*/
int msm_audio_ion_free(struct dma_buf *dma_buf)
{
int ret = 0;
if (!dma_buf) {
pr_err("%s: dma_buf invalid\n", __func__);
return -EINVAL;
}
msm_audio_ion_unmap_kernel(dma_buf);
ret = msm_audio_ion_unmap_kernel(dma_buf);
if (ret)
return ret;
msm_audio_dma_buf_unmap(dma_buf);