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

0503fd65 · Linus Torvalds <[email protected]> · 2018-05-13 10:28:53 -07:00

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"

Commit: 0503fd658d47503a9bad67aced45c46b1ecfaace
Parents: ccda3c4b · 05e13bb5

Merge commit. Changes below are compared with the first parent: ccda3c4b.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
lib/swiotlb.c	modified	+1	−1	View file

lib/swiotlb.c

View file

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 12fbaa4..cc64058 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -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_to_dma(dev, io_tlb_start),
-			0, size, DMA_FROM_DEVICE, 0);
+			0, size, DMA_FROM_DEVICE, attrs);
 	if (phys_addr == SWIOTLB_MAP_ERROR)
 		goto out_warn;
 