commit cf10b7e6209c43acf70f82b8d01997ffece88835
author Daniel Rosenberg <drosen@google.com> Fri Sep 09 15:26:59 2016 -0700
committer Nick Desaulniers <ndesaulniers@google.com> Fri Sep 16 12:04:56 2016 -0700
tree c688d3c2b521b6b0018e7f179ecfe7584a7391aa
parent 99666f7a393a2b84a7283e136b9460699be78630

ion: Disable ION_HEAP_TYPE_SYSTEM_CONTIG

Bug: 30400942
Change-Id: I19fa5bf6e5c66b532b842180b2cf0ae04ddca337
Signed-off-by: Daniel Rosenberg <drosen@google.com>

drivers/gpu/ion/ion_heap.c

diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c
index 3d37541..3832f23 100644
--- a/drivers/gpu/ion/ion_heap.c
+++ b/drivers/gpu/ion/ion_heap.c
@@ -137,8 +137,9 @@
 
 	switch (heap_data->type) {
 	case ION_HEAP_TYPE_SYSTEM_CONTIG:
-		heap = ion_system_contig_heap_create(heap_data);
-		break;
+		pr_err("%s: Heap type is disabled: %d\n", __func__,
+		       heap_data->type);
+		return ERR_PTR(-EINVAL);
 	case ION_HEAP_TYPE_SYSTEM:
 		heap = ion_system_heap_create(heap_data);
 		break;
@@ -174,7 +175,8 @@
 
 	switch (heap->type) {
 	case ION_HEAP_TYPE_SYSTEM_CONTIG:
-		ion_system_contig_heap_destroy(heap);
+		pr_err("%s: Heap type is disabled: %d\n", __func__,
+		       heap->type);
 		break;
 	case ION_HEAP_TYPE_SYSTEM:
 		ion_system_heap_destroy(heap);