diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2019-06-19 16:29:24 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2019-06-19 16:29:24 +0200 |
| commit | 8492101e15f9e2d30ab3533563d94590bb01c09c (patch) | |
| tree | c984e1ae424afb67ca94781b0e9042dbde7c304c /kernel/dma | |
| parent | swiotlb: Return consistent SWIOTLB segments/nr_tbl (diff) | |
| parent | swiotlb: fix phys_addr_t overflow warning (diff) | |
| download | linux-8492101e15f9e2d30ab3533563d94590bb01c09c.tar.xz linux-8492101e15f9e2d30ab3533563d94590bb01c09c.zip | |
Merge branch 'stable/for-linus-5.2' into devel/for-linus-5.2
* stable/for-linus-5.2:
swiotlb: fix phys_addr_t overflow warning
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/swiotlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index 72506085795c..2ca8a200be97 100644 --- a/kernel/dma/swiotlb.c +++ b/kernel/dma/swiotlb.c @@ -540,7 +540,7 @@ not_found: if (!(attrs & DMA_ATTR_NO_WARN) && printk_ratelimit()) dev_warn(hwdev, "swiotlb buffer is full (sz: %zd bytes), total %lu (slots), used %lu (slots)\n", size, io_tlb_nslabs, tmp_io_tlb_used); - return DMA_MAPPING_ERROR; + return (phys_addr_t)DMA_MAPPING_ERROR; found: io_tlb_used += nslots; spin_unlock_irqrestore(&io_tlb_lock, flags); @@ -658,7 +658,7 @@ bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr, /* Oh well, have to allocate and map a bounce buffer. */ *phys = swiotlb_tbl_map_single(dev, __phys_to_dma(dev, io_tlb_start), *phys, size, dir, attrs); - if (*phys == DMA_MAPPING_ERROR) + if (*phys == (phys_addr_t)DMA_MAPPING_ERROR) return false; /* Ensure that the address returned is DMA'ble */ |