samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "dsp: ion: avoid dma_buf_put twice when msm_audio_ion_map_buf fails"

Browse Source 
This reverts commit 48ff19f071.

Change-Id: I446016ea63e45ece389096cd02a60fdff1820b00
This commit is contained in:
Divya Sharma
2020-10-05 19:04:23 -07:00
parent 984a4dcaf7
commit be8401cbbd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dsp/msm_audio_ion_vm.c
View File

@@ -582,13 +582,17 @@ int msm_audio_ion_alloc(struct dma_buf **dma_buf, size_t bufsz,
rc = msm_audio_ion_map_buf(*dma_buf, paddr, plen, vaddr); rc = msm_audio_ion_map_buf(*dma_buf, paddr, plen, vaddr);
if (rc) { if (rc) {
pr_err("%s: failed to map ION buf, rc = %d\n", __func__, rc); pr_err("%s: failed to map ION buf, rc = %d\n", __func__, rc);
goto err; goto err_dma_buf;
} }
pr_debug("%s: mapped address = %pK, size=%zd\n", __func__, pr_debug("%s: mapped address = %pK, size=%zd\n", __func__,
*vaddr, bufsz); *vaddr, bufsz);
memset(*vaddr, 0, bufsz); memset(*vaddr, 0, bufsz);
return rc;
err_dma_buf:
dma_buf_put(*dma_buf);
err: err:
return rc; return rc;
} }