Merge "common: dma-mapping: make dma_common_contiguous_remap more robust" (033096f5) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/base/dma-mapping.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -298,7 +298,8 @@ void dma_common_contiguous_remap(struct page page, size_t size,
		struct page **pages;
		struct vm_struct *area;

		pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL);
		pages = kvmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL);

		if (!pages)
		return NULL;

		@@ -307,7 +308,7 @@ void dma_common_contiguous_remap(struct page page, size_t size,

		area = __dma_common_pages_remap(pages, size, vm_flags, prot, caller);

		kfree(pages);
		kvfree(pages);

		if (!area)
		return NULL;