projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_cursor.c
diff --git
a/drivers/gpu/drm/radeon/radeon_cursor.c
b/drivers/gpu/drm/radeon/radeon_cursor.c
index afaf346bd50e7c7628674e29d0eea14c8403e3ec..2a10e24b34b10b2f826e35c60556808efb2ebe2e 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/
drivers/gpu/drm/radeon/radeon_cursor.c
@@
-274,7
+274,7
@@
int radeon_crtc_cursor_set2(struct drm_crtc *crtc,
return -EINVAL;
}
- obj = drm_gem_object_lookup(
crtc->dev,
file_priv, handle);
+ obj = drm_gem_object_lookup(file_priv, handle);
if (!obj) {
DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, radeon_crtc->crtc_id);
return -ENOENT;