diff options
| author | Andrew F. Davis <afd@ti.com> | 2019-03-29 17:52:01 +0100 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2019-04-24 15:25:39 +0200 |
| commit | e3a9d6c53195591303b7f165f3bb0226741f911e (patch) | |
| tree | 29de8b3cdc104b526991e62dfa776673fa2a8a6c /drivers/dma-buf | |
| parent | dma-buf: Update [un]map documentation to match the other functions (diff) | |
| download | linux-e3a9d6c53195591303b7f165f3bb0226741f911e.tar.xz linux-e3a9d6c53195591303b7f165f3bb0226741f911e.zip | |
dma-buf: Make mmap callback actually optional
The docs state the callback is optional but it is not, make it optional.
Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190329165201.16233-1-afd@ti.com
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/dma-buf.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c index efd5d09d56ad..3ae6c0c2cc02 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -90,6 +90,10 @@ static int dma_buf_mmap_internal(struct file *file, struct vm_area_struct *vma) dmabuf = file->private_data; + /* check if buffer supports mmap */ + if (!dmabuf->ops->mmap) + return -EINVAL; + /* check for overflowing the buffer's size */ if (vma->vm_pgoff + vma_pages(vma) > dmabuf->size >> PAGE_SHIFT) @@ -404,8 +408,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info) || !exp_info->ops || !exp_info->ops->map_dma_buf || !exp_info->ops->unmap_dma_buf - || !exp_info->ops->release - || !exp_info->ops->mmap)) { + || !exp_info->ops->release)) { return ERR_PTR(-EINVAL); } @@ -906,6 +909,10 @@ int dma_buf_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma, if (WARN_ON(!dmabuf || !vma)) return -EINVAL; + /* check if buffer supports mmap */ + if (!dmabuf->ops->mmap) + return -EINVAL; + /* check for offset overflow */ if (pgoff + vma_pages(vma) < pgoff) return -EOVERFLOW; |