diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-03 06:27:39 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-03 06:27:39 -1000 |
| commit | c15f6d8d47152762a2819173599ce0eb135297f1 (patch) | |
| tree | 24f850845f35437aefca956fa9113a15f119f312 | |
| parent | f4ef6a438cee86ca0c6d1b889aa53bec9c1f9de6 (diff) | |
| parent | 892a0be43edd63e1cd228af3453a064e9e94f08e (diff) | |
| download | linux-c15f6d8d47152762a2819173599ce0eb135297f1.tar.bz2 | |
Merge tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fix from Christoph Hellwig:
"Fix an incorrect warning selection introduced in the last merge
window"
* tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping:
swiotlb: fix inversed DMA_ATTR_NO_WARN test
| -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 fece57566d45..12fbaa445637 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -737,7 +737,7 @@ out_unmap: swiotlb_tbl_unmap_single(dev, phys_addr, size, DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); out_warn: - if ((attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) { + if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) { dev_warn(dev, "swiotlb: coherent allocation failed, size=%zu\n", size); |