projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tty-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
exynos
/
exynos_drm_dmabuf.c
diff --git
a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
index
2a3ad24
..
60192ed
100644
(file)
--- a/
drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
+++ b/
drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
@@
-187,7
+187,7
@@
struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,
struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);
return dma_buf_export(obj, &exynos_dmabuf_ops,
struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);
return dma_buf_export(obj, &exynos_dmabuf_ops,
- exynos_gem_obj->base.size, flags);
+ exynos_gem_obj->base.size, flags
, NULL
);
}
struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,
}
struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,