Commit 0503fd65 authored by Linus Torvalds's avatar Linus Torvalds

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

Pull dma-mapping fix from Christoph Hellwig:
 "Just one little fix from Jean to avoid a harmless but very annoying
  warning, especially for the drm code"

* tag 'dma-mapping-4.17-5' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: silent unwanted warning "buffer is full"
parents ccda3c4b 05e13bb5
...@@ -714,7 +714,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle, ...@@ -714,7 +714,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle,
phys_addr = swiotlb_tbl_map_single(dev, phys_addr = swiotlb_tbl_map_single(dev,
__phys_to_dma(dev, io_tlb_start), __phys_to_dma(dev, io_tlb_start),
0, size, DMA_FROM_DEVICE, 0); 0, size, DMA_FROM_DEVICE, attrs);
if (phys_addr == SWIOTLB_MAP_ERROR) if (phys_addr == SWIOTLB_MAP_ERROR)
goto out_warn; goto out_warn;
......
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