Commit b56adb54 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 39618435 ec10665c
...@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void) ...@@ -346,6 +346,8 @@ static int __init atomic_pool_init(void)
(unsigned)pool->size / 1024); (unsigned)pool->size / 1024);
return 0; return 0;
} }
kfree(pages);
no_pages: no_pages:
kfree(bitmap); kfree(bitmap);
no_bitmap: no_bitmap:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment