Commit 7cdb85df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-5.4-1' of git://

Pull dma-mapping regression fix from Christoph Hellwig:
 "Revert an incorret hunk from a patch that caused problems on various
  arm boards (Andrey Smirnov)"

* tag 'dma-mapping-5.4-1' of git://
  dma-mapping: fix false positive warnings in dma_common_free_remap()
parents 43b815c6 2cf2aa6a
......@@ -87,9 +87,9 @@ void *dma_common_contiguous_remap(struct page *page, size_t size,
void dma_common_free_remap(void *cpu_addr, size_t size)
struct page **pages = dma_common_find_pages(cpu_addr);
struct vm_struct *area = find_vm_area(cpu_addr);
if (!pages) {
if (!area || area->flags != VM_DMA_COHERENT) {
WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment