summaryrefslogtreecommitdiff
path: root/drivers/gpu/msm
diff options
context:
space:
mode:
authorCarter Cooper <ccooper@codeaurora.org>2015-12-22 11:21:08 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:16:04 -0700
commit4318bd3cd61a656e5e0654d63c58886b70e64d12 (patch)
tree3d3005ad58d4681446e5f34549d5fad3db446120 /drivers/gpu/msm
parentd362e25309d571f42950855410a2ce81312eddcb (diff)
msm: kgsl: Free allocated memory on early return
Make sure the allocated memory is freed before returning. Change-Id: I6da7d1ffbd83ad206970e38ac99f9da211ffe86c Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
Diffstat (limited to 'drivers/gpu/msm')
-rw-r--r--drivers/gpu/msm/adreno_iommu.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/msm/adreno_iommu.c b/drivers/gpu/msm/adreno_iommu.c
index 45f5c9be64d9..ba240190f98b 100644
--- a/drivers/gpu/msm/adreno_iommu.c
+++ b/drivers/gpu/msm/adreno_iommu.c
@@ -824,16 +824,16 @@ static int _set_pagetable_gpu(struct adreno_ringbuffer *rb,
int result;
link = kmalloc(PAGE_SIZE, GFP_KERNEL);
- if (link == NULL) {
- result = -ENOMEM;
- goto done;
- }
+ if (link == NULL)
+ return -ENOMEM;
cmds = link;
/* If we are in a fault the MMU will be reset soon */
- if (test_bit(ADRENO_DEVICE_FAULT, &adreno_dev->priv))
+ if (test_bit(ADRENO_DEVICE_FAULT, &adreno_dev->priv)) {
+ kfree(link);
return 0;
+ }
kgsl_mmu_enable_clk(&device->mmu);
@@ -861,7 +861,6 @@ static int _set_pagetable_gpu(struct adreno_ringbuffer *rb,
adreno_ringbuffer_mmu_disable_clk_on_ts(device, rb,
rb->timestamp);
-done:
kfree(link);
return result;
}