aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-05 18:07:39 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-05 18:07:39 +0000
commit18ea671ba40bcbb15c47118e20010240186da33b (patch)
treed0251d807ab83bd54fb5ac3216996aa9a4fb2ea2 /Documentation
parent4fc2ea6a8608d9a649eff5e3c2ee477eb70f0fb6 (diff)
parentbad83565eafe8a00922ad4eed6920625a10a2126 (diff)
downloadlinux-stericsson-18ea671ba40bcbb15c47118e20010240186da33b.tar.gz
Merge tag 'dmaengine-fix-5.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul: "Fixes for: - Documentation build error fix - Fix dma_request_chan() error return - Remove unneeded conversion in idxd driver - Fix pointer check for dma_async_device_channel_register() - Fix slave-channel symlink cleanup" * tag 'dmaengine-fix-5.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: Cleanups for the slave <-> channel symlink support dmaengine: fix null ptr check for __dma_async_device_channel_register() dmaengine: idxd: fix boolconv.cocci warnings dmaengine: Fix return value for dma_request_chan() in case of failure dmaengine: doc: Properly indent metadata title
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/driver-api/dmaengine/client.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/driver-api/dmaengine/client.rst b/Documentation/driver-api/dmaengine/client.rst
index a9a7a3c84c63..e5953e7e4bf4 100644
--- a/Documentation/driver-api/dmaengine/client.rst
+++ b/Documentation/driver-api/dmaengine/client.rst
@@ -151,8 +151,8 @@ The details of these operations are:
Note that callbacks will always be invoked from the DMA
engines tasklet, never from interrupt context.
- Optional: per descriptor metadata
- ---------------------------------
+Optional: per descriptor metadata
+---------------------------------
DMAengine provides two ways for metadata support.
DESC_METADATA_CLIENT