git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-misc-next-2020-06-19' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
dispnv04
/
crtc.c
diff --git
a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 2de589caf5081dd8703c27b80d86457700e6350c..640738f3196ce8fe931c72fa2ef6633e22adf691 100644
(file)
--- a/
drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/
drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@
-1017,7
+1017,7
@@
nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
nv_crtc->cursor.set_offset(nv_crtc, nv_crtc->cursor.offset);
nv_crtc->cursor.show(nv_crtc, true);
out:
- drm_gem_object_put
_unlocked
(gem);
+ drm_gem_object_put(gem);
return ret;
}