Skip to content

Commit 0503fd6

Browse files
committed
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"
2 parents ccda3c4 + 05e13bb commit 0503fd6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

lib/swiotlb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle,
714714

715715
phys_addr = swiotlb_tbl_map_single(dev,
716716
__phys_to_dma(dev, io_tlb_start),
717-
0, size, DMA_FROM_DEVICE, 0);
717+
0, size, DMA_FROM_DEVICE, attrs);
718718
if (phys_addr == SWIOTLB_MAP_ERROR)
719719
goto out_warn;
720720

0 commit comments

Comments
 (0)