summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-27 15:46:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-27 15:46:04 -0700
commitb56adb54e825fc548126b20b479d138a683d2b8c (patch)
treeafccd7c7b19cd4fe50e397a332c7b45c9b62eec2
parent39618435a0d9f4269b2374da68eb652cfa777b0c (diff)
parentec10665cbf271fb1f60daeb194ad4f2cdcdc59d9 (diff)
downloadop-kernel-dev-b56adb54e825fc548126b20b479d138a683d2b8c.zip
op-kernel-dev-b56adb54e825fc548126b20b479d138a683d2b8c.tar.gz
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull ARM dma-mapping fix from Marek Szyprowski: "This patch fixes a potential memory leak in the ARM dma-mapping code." * 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()
-rw-r--r--arch/arm/mm/dma-mapping.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e59c4ab..13f555d 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void)
(unsigned)pool->size / 1024);
return 0;
}
+
+ kfree(pages);
no_pages:
kfree(bitmap);
no_bitmap:
OpenPOWER on IntegriCloud