diff options
Diffstat (limited to 'drivers/dma-buf/dma-buf.c')
-rw-r--r-- | drivers/dma-buf/dma-buf.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index bc1cb284111c..058805b6d164 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c | |||
@@ -351,13 +351,13 @@ static inline int is_dma_buf_file(struct file *file) | |||
351 | * | 351 | * |
352 | * 2. Userspace passes this file-descriptors to all drivers it wants this buffer | 352 | * 2. Userspace passes this file-descriptors to all drivers it wants this buffer |
353 | * to share with: First the filedescriptor is converted to a &dma_buf using | 353 | * to share with: First the filedescriptor is converted to a &dma_buf using |
354 | * dma_buf_get(). The the buffer is attached to the device using | 354 | * dma_buf_get(). Then the buffer is attached to the device using |
355 | * dma_buf_attach(). | 355 | * dma_buf_attach(). |
356 | * | 356 | * |
357 | * Up to this stage the exporter is still free to migrate or reallocate the | 357 | * Up to this stage the exporter is still free to migrate or reallocate the |
358 | * backing storage. | 358 | * backing storage. |
359 | * | 359 | * |
360 | * 3. Once the buffer is attached to all devices userspace can inniate DMA | 360 | * 3. Once the buffer is attached to all devices userspace can initiate DMA |
361 | * access to the shared buffer. In the kernel this is done by calling | 361 | * access to the shared buffer. In the kernel this is done by calling |
362 | * dma_buf_map_attachment() and dma_buf_unmap_attachment(). | 362 | * dma_buf_map_attachment() and dma_buf_unmap_attachment(). |
363 | * | 363 | * |
@@ -617,7 +617,7 @@ EXPORT_SYMBOL_GPL(dma_buf_detach); | |||
617 | * Returns sg_table containing the scatterlist to be returned; returns ERR_PTR | 617 | * Returns sg_table containing the scatterlist to be returned; returns ERR_PTR |
618 | * on error. May return -EINTR if it is interrupted by a signal. | 618 | * on error. May return -EINTR if it is interrupted by a signal. |
619 | * | 619 | * |
620 | * A mapping must be unmapped again using dma_buf_map_attachment(). Note that | 620 | * A mapping must be unmapped by using dma_buf_unmap_attachment(). Note that |
621 | * the underlying backing storage is pinned for as long as a mapping exists, | 621 | * the underlying backing storage is pinned for as long as a mapping exists, |
622 | * therefore users/importers should not hold onto a mapping for undue amounts of | 622 | * therefore users/importers should not hold onto a mapping for undue amounts of |
623 | * time. | 623 | * time. |
@@ -1179,8 +1179,7 @@ static int dma_buf_init_debugfs(void) | |||
1179 | 1179 | ||
1180 | static void dma_buf_uninit_debugfs(void) | 1180 | static void dma_buf_uninit_debugfs(void) |
1181 | { | 1181 | { |
1182 | if (dma_buf_debugfs_dir) | 1182 | debugfs_remove_recursive(dma_buf_debugfs_dir); |
1183 | debugfs_remove_recursive(dma_buf_debugfs_dir); | ||
1184 | } | 1183 | } |
1185 | #else | 1184 | #else |
1186 | static inline int dma_buf_init_debugfs(void) | 1185 | static inline int dma_buf_init_debugfs(void) |