From be8401cbbd03989a3a01b6e4e4104c6a7952b532 Mon Sep 17 00:00:00 2001 From: Divya Sharma Date: Mon, 5 Oct 2020 19:04:23 -0700 Subject: [PATCH] Revert "dsp: ion: avoid dma_buf_put twice when msm_audio_ion_map_buf fails" This reverts commit 48ff19f07187319ac3a49d75b1ff2c7bdf49c3ea. Change-Id: I446016ea63e45ece389096cd02a60fdff1820b00 --- dsp/msm_audio_ion_vm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dsp/msm_audio_ion_vm.c b/dsp/msm_audio_ion_vm.c index 2cf2861d9f..1d3002985b 100644 --- a/dsp/msm_audio_ion_vm.c +++ b/dsp/msm_audio_ion_vm.c @@ -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); if (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__, *vaddr, bufsz); memset(*vaddr, 0, bufsz); + return rc; + +err_dma_buf: + dma_buf_put(*dma_buf); err: return rc; }