diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-13 10:28:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-13 10:28:53 -0700 |
| commit | 0503fd658d47503a9bad67aced45c46b1ecfaace (patch) | |
| tree | 694a853c486c4a9fa07bf01fd7d0ac1d6e0d685f /lib | |
| parent | ccda3c4b77777f66aeb3c531352bb40d59501c59 (diff) | |
| parent | 05e13bb57e6f181d7605f8608181c7e6fb7f591d (diff) | |
| download | talos-obmc-linux-0503fd658d47503a9bad67aced45c46b1ecfaace.tar.gz talos-obmc-linux-0503fd658d47503a9bad67aced45c46b1ecfaace.zip | |
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"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/swiotlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 12fbaa445637..cc640588f145 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; |
