summaryrefslogtreecommitdiff
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorHeesub Shin <heesub.shin@samsung.com>2014-06-20 11:46:14 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 19:58:56 -0700
commit895ae8765726df407264dc661674e4e04eaf8664 (patch)
tree0bf7a1ec0a9a90d214b8edcd4505c92d63c2a898 /drivers/staging/android
parent32c3f470ec7e427db69d86a3061101ea4a5c681f (diff)
downloadlwn-895ae8765726df407264dc661674e4e04eaf8664.tar.gz
lwn-895ae8765726df407264dc661674e4e04eaf8664.zip
staging: ion: fixup invalid kfree() calls on heap destroy
I've noticed that the last commit to ion_system_heap.c ('staging: ion: optimize struct ion_system_heap') has an omission, so an invalid kfree() gets called on ion_system_heap_destroy(). As ION system heap is never destroyed until system shutdown, it may not cause any harm, but should be fixed. I should have caught this before the merge, my bad. Signed-off-by: Heesub Shin <heesub.shin@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/ion/ion_system_heap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index c826b4c63861..6b77c5195b4d 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -304,7 +304,6 @@ void ion_system_heap_destroy(struct ion_heap *heap)
for (i = 0; i < num_orders; i++)
ion_page_pool_destroy(sys_heap->pools[i]);
- kfree(sys_heap->pools);
kfree(sys_heap);
}