|
@@ -287,6 +287,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
|
|
|
struct reservation_object *resv = exp_info->resv;
|
|
|
struct file *file;
|
|
|
size_t alloc_size = sizeof(struct dma_buf);
|
|
|
+
|
|
|
if (!exp_info->resv)
|
|
|
alloc_size += sizeof(struct reservation_object);
|
|
|
else
|
|
@@ -553,7 +554,8 @@ int dma_buf_begin_cpu_access(struct dma_buf *dmabuf, size_t start, size_t len,
|
|
|
return -EINVAL;
|
|
|
|
|
|
if (dmabuf->ops->begin_cpu_access)
|
|
|
- ret = dmabuf->ops->begin_cpu_access(dmabuf, start, len, direction);
|
|
|
+ ret = dmabuf->ops->begin_cpu_access(dmabuf, start,
|
|
|
+ len, direction);
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
@@ -657,7 +659,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);
|
|
|
* @dmabuf: [in] buffer that should back the vma
|
|
|
* @vma: [in] vma for the mmap
|
|
|
* @pgoff: [in] offset in pages where this mmap should start within the
|
|
|
- * dma-buf buffer.
|
|
|
+ * dma-buf buffer.
|
|
|
*
|
|
|
* This function adjusts the passed in vma so that it points at the file of the
|
|
|
* dma_buf operation. It also adjusts the starting pgoff and does bounds
|
|
@@ -834,6 +836,7 @@ static int dma_buf_describe(struct seq_file *s)
|
|
|
static int dma_buf_show(struct seq_file *s, void *unused)
|
|
|
{
|
|
|
void (*func)(struct seq_file *) = s->private;
|
|
|
+
|
|
|
func(s);
|
|
|
return 0;
|
|
|
}
|
|
@@ -855,7 +858,9 @@ static struct dentry *dma_buf_debugfs_dir;
|
|
|
static int dma_buf_init_debugfs(void)
|
|
|
{
|
|
|
int err = 0;
|
|
|
+
|
|
|
dma_buf_debugfs_dir = debugfs_create_dir("dma_buf", NULL);
|
|
|
+
|
|
|
if (IS_ERR(dma_buf_debugfs_dir)) {
|
|
|
err = PTR_ERR(dma_buf_debugfs_dir);
|
|
|
dma_buf_debugfs_dir = NULL;
|