diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2018-12-05 11:14:01 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2018-12-05 05:49:10 -0800 |
| commit | a1da439cc0d929891f0f7372c9e03530c809068c (patch) | |
| tree | a5b96286aa000411d10f7650df08405da3d84067 | |
| parent | f04b951f6c7eccd85ea7750a5fafa68fb98d6bfa (diff) | |
| download | linux-a1da439cc0d929891f0f7372c9e03530c809068c.tar.gz linux-a1da439cc0d929891f0f7372c9e03530c809068c.tar.bz2 linux-a1da439cc0d929891f0f7372c9e03530c809068c.zip | |
dma-mapping: fix lack of DMA address assignment in generic remap allocator
Commit bfd56cd60521 ("dma-mapping: support highmem in the generic remap
allocator") replaced dma_direct_alloc_pages() with __dma_direct_alloc_pages(),
which doesn't set dma_handle and zero allocated memory. Fix it by doing this
directly in the caller function.
Fixes: bfd56cd60521 ("dma-mapping: support highmem in the generic remap allocator")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | kernel/dma/remap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/dma/remap.c b/kernel/dma/remap.c index 68a64e3ff6a1..8a44317cfc1a 100644 --- a/kernel/dma/remap.c +++ b/kernel/dma/remap.c @@ -223,8 +223,14 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, ret = dma_common_contiguous_remap(page, size, VM_USERMAP, arch_dma_mmap_pgprot(dev, PAGE_KERNEL, attrs), __builtin_return_address(0)); - if (!ret) + if (!ret) { __dma_direct_free_pages(dev, size, page); + return ret; + } + + *dma_handle = phys_to_dma(dev, page_to_phys(page)); + memset(ret, 0, size); + return ret; } |