diff options
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index e0f14ee26b68..b0bd4e5fd5cf 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c | |||
| @@ -104,7 +104,6 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, | |||
| 104 | struct page *page; | 104 | struct page *page; |
| 105 | void *addr; | 105 | void *addr; |
| 106 | 106 | ||
| 107 | size = PAGE_ALIGN(size); | ||
| 108 | page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT, | 107 | page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT, |
| 109 | get_order(size)); | 108 | get_order(size)); |
| 110 | if (!page) | 109 | if (!page) |
| @@ -193,6 +192,8 @@ static void __dma_free(struct device *dev, size_t size, | |||
| 193 | { | 192 | { |
| 194 | void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle)); | 193 | void *swiotlb_addr = phys_to_virt(dma_to_phys(dev, dma_handle)); |
| 195 | 194 | ||
| 195 | size = PAGE_ALIGN(size); | ||
| 196 | |||
| 196 | if (!is_device_dma_coherent(dev)) { | 197 | if (!is_device_dma_coherent(dev)) { |
| 197 | if (__free_from_pool(vaddr, size)) | 198 | if (__free_from_pool(vaddr, size)) |
| 198 | return; | 199 | return; |
