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 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_dmabuf.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index
10265bb
..
97c9d68
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/
drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@
-283,7
+283,7
@@
struct dma_buf *i915_gem_prime_export(struct drm_device *dev,
return ERR_PTR(ret);
}
- dma_buf = d
ma_buf_export(
&exp_info);
+ dma_buf = d
rm_gem_dmabuf_export(dev,
&exp_info);
if (IS_ERR(dma_buf))
return dma_buf;