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

Commit c712dc92 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: dma-mapping: Add missing debug information" into msm-4.9

parents c0aaf9d0 2fc0b347

arch/arm64/mm/dma-mapping.c

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ static void *__dma_alloc(struct device *dev, size_t size, 
		page = virt_to_page(ptr);

		prot = __get_dma_pgprot(attrs, __pgprot(PROT_NORMAL_NC), false);

		coherent_ptr = dma_common_contiguous_remap(

					page, size, VM_USERMAP, prot, NULL);

					page, size, VM_USERMAP, prot,

					__builtin_return_address(0));

		if (!coherent_ptr)

			goto no_map;

	}