Merge "arm: dma-mapping: DMA buf may not have cpu virtual addr" (a2d8e855) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mm/dma-mapping.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1024,9 +1024,10 @@ static void __arm_dma_free(struct device dev, size_t size, void cpu_addr,
		.page = page,
		.want_vaddr = ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) == 0),
		};
		void *addr = (args.want_vaddr) ? cpu_addr : page;

		buf = arm_dma_buffer_find(cpu_addr);
		if (WARN(!buf, "Freeing invalid buffer %p\n", cpu_addr))
		buf = arm_dma_buffer_find(addr);
		if (WARN(!buf, "Freeing invalid buffer %pK\n", addr))
		return;

		buf->allocator->free(&args);