Merge branch 'for-5.12/dax' into libnvdimm-fixes

[linux-2.6-microblaze.git] / include / linux / dma-heap.h

diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h
index 454e354..5bc5c94 100644 (file)
--- a/include/linux/dma-heap.h
+++ b/include/linux/dma-heap.h
@@ -16,15 +16,15 @@ struct dma_heap;
 
 /**
  * struct dma_heap_ops - ops to operate on a given heap
- * @allocate:          allocate dmabuf and return fd
+ * @allocate:          allocate dmabuf and return struct dma_buf ptr
  *
- * allocate returns dmabuf fd  on success, -errno on error.
+ * allocate returns dmabuf on success, ERR_PTR(-errno) on error.
  */
 struct dma_heap_ops {
-       int (*allocate)(struct dma_heap *heap,
-                       unsigned long len,
-                       unsigned long fd_flags,
-                       unsigned long heap_flags);
+       struct dma_buf *(*allocate)(struct dma_heap *heap,
+                                   unsigned long len,
+                                   unsigned long fd_flags,
+                                   unsigned long heap_flags);
 };
 
 /**