diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-26 15:19:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-26 15:19:16 -0800 |
| commit | 944e15f200475d530096cba489833dc6dcd8d1e1 (patch) | |
| tree | b1ab47c43b7fa030acee5d083c0a258833a7f4c4 /kernel | |
| parent | e094883b508bbcb54f9dfbbd4cdae66c25d86c81 (diff) | |
| parent | d5b5e8149af0f5efed58653cbebf1cb3258ce49a (diff) | |
Merge tag 'dma-mapping-7.0-2026-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux
Pull dma-mapping fixes from Marek Szyprowski:
"Two DMA-mapping fixes for the recently merged API rework (Jiri Pirko
and Stian Halseth)"
* tag 'dma-mapping-7.0-2026-02-26' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
sparc: Fix page alignment in dma mapping
dma-mapping: avoid random addr value print out on error path
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/dma/direct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index f476c63b668c..e89f175e9c2d 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -85,7 +85,7 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev, if (is_swiotlb_force_bounce(dev)) { if (attrs & DMA_ATTR_MMIO) - goto err_overflow; + return DMA_MAPPING_ERROR; return swiotlb_map(dev, phys, size, dir, attrs); } |