diff options
author | Dave Airlie <airlied@redhat.com> | 2012-03-16 06:34:02 -0400 |
---|---|---|
committer | Sumit Semwal <sumit.semwal@ti.com> | 2012-03-26 02:02:26 -0400 |
commit | 55c1c4ca23d0f2736ef7c219d0fb005323ff8ee0 (patch) | |
tree | 52c2ae868121e09df3d77fc998f233549cf8ae34 /drivers | |
parent | 33ea2dcb39ba50b0b69d1b1dc24702f084b46411 (diff) |
dma-buf: pass flags into dma_buf_fd.
We need to pass the flags into dma_buf_fd at this point,
so the flags end up doing the right thing for O_CLOEXEC.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/dma-buf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c index c9a945fd1a0..3c8c0232ce4 100644 --- a/drivers/base/dma-buf.c +++ b/drivers/base/dma-buf.c | |||
@@ -107,17 +107,18 @@ EXPORT_SYMBOL_GPL(dma_buf_export); | |||
107 | /** | 107 | /** |
108 | * dma_buf_fd - returns a file descriptor for the given dma_buf | 108 | * dma_buf_fd - returns a file descriptor for the given dma_buf |
109 | * @dmabuf: [in] pointer to dma_buf for which fd is required. | 109 | * @dmabuf: [in] pointer to dma_buf for which fd is required. |
110 | * @flags: [in] flags to give to fd | ||
110 | * | 111 | * |
111 | * On success, returns an associated 'fd'. Else, returns error. | 112 | * On success, returns an associated 'fd'. Else, returns error. |
112 | */ | 113 | */ |
113 | int dma_buf_fd(struct dma_buf *dmabuf) | 114 | int dma_buf_fd(struct dma_buf *dmabuf, int flags) |
114 | { | 115 | { |
115 | int error, fd; | 116 | int error, fd; |
116 | 117 | ||
117 | if (!dmabuf || !dmabuf->file) | 118 | if (!dmabuf || !dmabuf->file) |
118 | return -EINVAL; | 119 | return -EINVAL; |
119 | 120 | ||
120 | error = get_unused_fd(); | 121 | error = get_unused_fd_flags(flags); |
121 | if (error < 0) | 122 | if (error < 0) |
122 | return error; | 123 | return error; |
123 | fd = error; | 124 | fd = error; |