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-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "dsp: ion: unmap DMA buffer after kernel ion map failure"

Browse source
This commit is contained in:
qctecmdr 2019-07-04 05:58:39 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1534fa3eea
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dsp/msm_audio_ion.c
View file

@ -316,6 +316,7 @@ static int msm_audio_ion_map_buf(struct dma_buf *dma_buf, dma_addr_t *paddr,
if (rc) {
pr_err("%s: ION Get Physical for AUDIO failed, rc = %d\n",
__func__, rc);
dma_buf_put(dma_buf);
goto err;
}
@ -323,6 +324,7 @@ static int msm_audio_ion_map_buf(struct dma_buf *dma_buf, dma_addr_t *paddr,
if (IS_ERR_OR_NULL(*vaddr)) {
pr_err("%s: ION memory mapping for AUDIO failed\n", __func__);
rc = -ENOMEM;
msm_audio_dma_buf_unmap(dma_buf);
goto err;
}
@ -384,17 +386,13 @@ int msm_audio_ion_alloc(struct dma_buf **dma_buf, size_t bufsz,
rc = msm_audio_ion_map_buf(*dma_buf, paddr, plen, vaddr);
if (rc) {
pr_err("%s: failed to map ION buf, rc = %d\n", __func__, rc);
goto err_dma_buf;
goto err;
}
pr_debug("%s: mapped address = %pK, size=%zd\n", __func__,
*vaddr, bufsz);
memset(*vaddr, 0, bufsz);
return rc;
err_dma_buf:
dma_buf_put(*dma_buf);
err:
return rc;
}
@ -488,7 +486,7 @@ int msm_audio_ion_import(struct dma_buf **dma_buf, int fd,
rc = msm_audio_ion_map_buf(*dma_buf, paddr, plen, vaddr);
if (rc) {
pr_err("%s: failed to map ION buf, rc = %d\n", __func__, rc);
goto err_ion_flag;
goto err;
}
pr_debug("%s: mapped address = %pK, size=%zd\n", __func__,
*vaddr, bufsz);

6
dsp/msm_audio_ion_vm.c
View file

@ -547,6 +547,7 @@ static int msm_audio_ion_map_buf(void *handle, dma_addr_t *paddr,
if (rc) {
pr_err("%s: ION Get Physical for AUDIO failed, rc = %d\n",
__func__, rc);
dma_buf_put(dma_buf);
goto err;
}
@ -554,6 +555,7 @@ static int msm_audio_ion_map_buf(void *handle, dma_addr_t *paddr,
if (IS_ERR_OR_NULL(*vaddr)) {
pr_err("%s: ION memory mapping for AUDIO failed\n", __func__);
rc = -ENOMEM;
msm_audio_dma_buf_unmap(dma_buf);
goto err;
}
@ -624,7 +626,6 @@ int msm_audio_ion_alloc(void **handle, size_t bufsz,
if (rc) {
pr_err("%s: failed to map ION buf, rc = %d\n", __func__,
rc);
dma_buf_put((struct dma_buf*) *handle);
}
} else {
rc = msm_audio_dma_buf_map(*handle, *vaddr, paddr,
@ -641,7 +642,6 @@ int msm_audio_ion_alloc(void **handle, size_t bufsz,
memset(*vaddr, 0, bufsz);
return rc;
err:
return rc;
}
@ -699,7 +699,7 @@ int msm_audio_ion_import(void **handle, int fd,
rc = msm_audio_ion_map_buf(*handle, paddr, plen, vaddr);
if (rc) {
pr_err("%s: failed to map ION buf, rc = %d\n", __func__, rc);
goto err_ion_flag;
goto err;
}
pr_debug("%s: mapped address = %pK, size=%zd\n", __func__,
*vaddr, bufsz);