summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-08-15 00:02:38 +0200
committerChanho Park <chanho61.park@samsung.com>2014-11-21 19:12:24 +0900
commit7ce0d0b269939b33c1e578219c96c1897c705c25 (patch)
tree30939437fab6c0d613b55ef99f614e74ae8a1264 /drivers/gpu/drm
parent44626077c9f062429b9ca345db1a4ff937d38542 (diff)
downloadlinux-3.10-7ce0d0b269939b33c1e578219c96c1897c705c25.tar.gz
linux-3.10-7ce0d0b269939b33c1e578219c96c1897c705c25.tar.bz2
linux-3.10-7ce0d0b269939b33c1e578219c96c1897c705c25.zip
drm/prime: fix error path in drm_gem_prime_fd_to_handle
handle_unreference only clears up the obj->name and the reference, but would leave a dangling handle in the idr. The right thing to do is to call handle_delete. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/drm_prime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index d39fe52560d..372711a2876 100644
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -476,7 +476,7 @@ fail:
/* hmm, if driver attached, we are relying on the free-object path
* to detach.. which seems ok..
*/
- drm_gem_object_handle_unreference_unlocked(obj);
+ drm_gem_handle_delete(file_priv, *handle);
out_put:
dma_buf_put(dma_buf);
mutex_unlock(&file_priv->prime.lock);