From b53d514f0db2046c1473f9bde725e0bbf13e19e0 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Tue, 15 Sep 2020 16:03:13 +0800 Subject: [PATCH] dsp: ion: avoid dma_buf_put twice when msm_audio_ion_map_buf fails Update logic to avoid calling dma_buf_put twice when msm_audio_ion_map_buf fails. Change-Id: I6958ec55dc78f245e93fbaedf085873fe0f4cb93 Signed-off-by: Meng Wang --- dsp/msm_audio_ion_vm.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dsp/msm_audio_ion_vm.c b/dsp/msm_audio_ion_vm.c index 1d3002985b..2cf2861d9f 100644 --- a/dsp/msm_audio_ion_vm.c +++ b/dsp/msm_audio_ion_vm.c @@ -582,17 +582,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; }