| From 421160823f6c3ae825bdad6aab391b1db710078a Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Thu, 15 Aug 2013 00:02:38 +0200 |
| Subject: 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> |
| (cherry picked from commit 730c4ff95eb54e5bab39357baddd0aa6da10d4fb) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/drm_prime.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c |
| index 330df93ad2d2..01d6ccda7050 100644 |
| --- a/drivers/gpu/drm/drm_prime.c |
| +++ b/drivers/gpu/drm/drm_prime.c |
| @@ -354,7 +354,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); |
| -- |
| 1.8.5.rc3 |
| |
