diff options
-rw-r--r-- | arch/arm64/mm/dma-mapping.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index ef7d112f5ce0..e0f14ee26b68 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c | |||
@@ -67,8 +67,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page, gfp_t flags) | |||
67 | 67 | ||
68 | *ret_page = phys_to_page(phys); | 68 | *ret_page = phys_to_page(phys); |
69 | ptr = (void *)val; | 69 | ptr = (void *)val; |
70 | if (flags & __GFP_ZERO) | 70 | memset(ptr, 0, size); |
71 | memset(ptr, 0, size); | ||
72 | } | 71 | } |
73 | 72 | ||
74 | return ptr; | 73 | return ptr; |
@@ -113,8 +112,7 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, | |||
113 | 112 | ||
114 | *dma_handle = phys_to_dma(dev, page_to_phys(page)); | 113 | *dma_handle = phys_to_dma(dev, page_to_phys(page)); |
115 | addr = page_address(page); | 114 | addr = page_address(page); |
116 | if (flags & __GFP_ZERO) | 115 | memset(addr, 0, size); |
117 | memset(addr, 0, size); | ||
118 | return addr; | 116 | return addr; |
119 | } else { | 117 | } else { |
120 | return swiotlb_alloc_coherent(dev, size, dma_handle, flags); | 118 | return swiotlb_alloc_coherent(dev, size, dma_handle, flags); |