diff options
| author | Mark Brown <broonie@kernel.org> | 2021-09-21 15:23:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-09-21 15:23:50 +0100 |
| commit | 66ae258ccf400e5275b8cb4ecbfe7d25f2cb2e56 (patch) | |
| tree | 386a7b596562b7dd99163e1c80255335711e7afc /kernel/dma | |
| parent | 09134c5322df9f105d9ed324051872d5d0e162aa (diff) | |
| parent | ffb1e76f4f32d2b8ea4189df0484980370476395 (diff) | |
| download | cachepc-linux-66ae258ccf400e5275b8cb4ecbfe7d25f2cb2e56.tar.gz cachepc-linux-66ae258ccf400e5275b8cb4ecbfe7d25f2cb2e56.zip | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/debug.c | 3 | ||||
| -rw-r--r-- | kernel/dma/mapping.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c index 6c90c69e5311..95445bd6eb72 100644 --- a/kernel/dma/debug.c +++ b/kernel/dma/debug.c @@ -567,7 +567,8 @@ static void add_dma_entry(struct dma_debug_entry *entry) pr_err("cacheline tracking ENOMEM, dma-debug disabled\n"); global_disable = true; } else if (rc == -EEXIST) { - pr_err("cacheline tracking EEXIST, overlapping mappings aren't supported\n"); + err_printk(entry->dev, entry, + "cacheline tracking EEXIST, overlapping mappings aren't supported\n"); } } diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 7ee5284bff58..06fec5547e7c 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -206,7 +206,8 @@ static int __dma_map_sg_attrs(struct device *dev, struct scatterlist *sg, /** * dma_map_sg_attrs - Map the given buffer for DMA * @dev: The device for which to perform the DMA operation - * @sg: The sg_table object describing the buffer + * @sg: The sg_table object describing the buffer + * @nents: Number of entries to map * @dir: DMA direction * @attrs: Optional DMA attributes for the map operation * |