OSDN Git Service

staging: ion: fixup invalid kfree() calls on heap destroy
authorHeesub Shin <heesub.shin@samsung.com>
Fri, 20 Jun 2014 02:46:14 +0000 (11:46 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jun 2014 02:58:56 +0000 (19:58 -0700)
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>
drivers/staging/android/ion/ion_system_heap.c

index c826b4c..6b77c51 100644 (file)
@@ -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);
 }