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

Commit c5c177c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-4.17-2' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping fix from Christoph Hellwig:
 "Fix for one swiotlb regression in 2.16 from Takashi"

* tag 'dma-mapping-4.17-2' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: fix unexpected swiotlb_alloc_coherent failures
parents d1cb7718 9e7f06c8

lib/swiotlb.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, 
		goto out_warn;



	*dma_handle = __phys_to_dma(dev, phys_addr);

	if (dma_coherent_ok(dev, *dma_handle, size))

	if (!dma_coherent_ok(dev, *dma_handle, size))

		goto out_unmap;



	memset(phys_to_virt(phys_addr), 0, size);