diff options
| author | Daniel Rosenberg <drosen@google.com> | 2016-09-09 15:32:34 -0700 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2019-02-08 11:24:58 -0800 |
| commit | 80eb28557a8b3c5cb675f7696fef360080d3dab2 (patch) | |
| tree | bc0cc8d4a09dcf14cfe170d738824ec81e299725 | |
| parent | 71a27400f626ab7b9fa1b6d686dba7712426044f (diff) | |
ion: Disable ION_HEAP_TYPE_SYSTEM_CONTIG
Bug: 30400942
Change-Id: I19fa5bf6e5c66b532b842180b2cf0ae04ddca337
Signed-off-by: Daniel Rosenberg <drosen@google.com>
| -rw-r--r-- | drivers/staging/android/ion/ion_heap.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index 13a9b4c42b26..ac331c898f5e 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -321,8 +321,9 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data) 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; @@ -361,7 +362,8 @@ void ion_heap_destroy(struct ion_heap *heap) 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); |