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

Commit 0b458123 authored by Jeevan Shriram's avatar Jeevan Shriram Committed by Avaneesh Kumar Dwivedi
Browse files

dma: fix arguments when calling dma APIs



When compiling for 32 bit arm, compilation fails due to incorrect number
of arguments to dma APIS

Change-Id: I0f150e4e89fa9745832015d74d2b09e871f4371a
Signed-off-by: default avatarJeevan Shriram <jshriram@codeaurora.org>
[akdwived: resolved merge conflict]
Signed-off-by: default avatarAvaneesh Kumar Dwivedi <akdwived@codeaurora.org>
parent 5029d47c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot,
static void __dma_free_remap(void *cpu_addr, size_t size)
{
	dma_common_free_remap(cpu_addr, size,
			VM_ARM_DMA_CONSISTENT | VM_USERMAP);
			VM_ARM_DMA_CONSISTENT | VM_USERMAP, false);
}

#define DEFAULT_DMA_COHERENT_POOL_SIZE	SZ_256K
@@ -1666,7 +1666,7 @@ void __arm_iommu_free_attrs(struct device *dev, size_t size, void *cpu_addr,

	if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) == 0) {
		dma_common_free_remap(cpu_addr, size,
			VM_ARM_DMA_CONSISTENT | VM_USERMAP);
			VM_ARM_DMA_CONSISTENT | VM_USERMAP, true);
	}

	__iommu_remove_mapping(dev, handle, size);