diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2014-10-03 09:29:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-10-03 09:29:35 +1000 |
| commit | 8998fc4cd77e06bb5c47c443f74425220faf3596 (patch) | |
| tree | 81ba67a95f21be920ba26954b3c3254beca8d815 /drivers/base | |
| parent | e92f6296f3a2dd2e24606874379b489f7b3ab382 (diff) | |
drivers-dma-coherent-add-initialization-from-device-tree-fix
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Josh Cartwright <joshc@codeaurora.org>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Laura Abbott <lauraa@codeaurora.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/dma-coherent.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c index 8f88c91890f2..5d5f998f57c1 100644 --- a/drivers/base/dma-coherent.c +++ b/drivers/base/dma-coherent.c @@ -40,7 +40,7 @@ static int dma_init_coherent_memory(phys_addr_t phys_addr, dma_addr_t device_add goto out; dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL); if (!dma_mem->bitmap) - goto free1_out; + goto out; dma_mem->virt_base = mem_base; dma_mem->device_base = device_addr; @@ -56,9 +56,8 @@ static int dma_init_coherent_memory(phys_addr_t phys_addr, dma_addr_t device_add return DMA_MEMORY_IO; - free1_out: +out: kfree(dma_mem); - out: if (mem_base) iounmap(mem_base); return 0; |