Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f8d1368 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: ion: add dma type support"

parents 5855d17a 21e9d894

drivers/staging/android/ion/ion.c

+2 −1
Original line number Diff line number Diff line
@@ -1133,7 +1133,8 @@ struct dma_buf *ion_alloc(size_t len, unsigned int heap_id_mask, 
		    heap->type == ION_HEAP_TYPE_CARVEOUT ||

		    heap->type == (enum ion_heap_type)ION_HEAP_TYPE_HYP_CMA ||

		    heap->type ==

			(enum ion_heap_type)ION_HEAP_TYPE_SYSTEM_SECURE) {

			(enum ion_heap_type)ION_HEAP_TYPE_SYSTEM_SECURE ||

		    heap->type == (enum ion_heap_type)ION_HEAP_TYPE_DMA) {

			type_valid = true;

		} else {

			pr_warn("%s: heap type not supported, type:%d\n",