From eee6c5ca7e9738ec09d253c0f4e2fae25b6c8b5c Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 19 Mar 2013 09:57:57 +1000 Subject: [PATCH] --- yaml --- r: 361533 b: refs/heads/master c: 4fa133954e91b83cfa22947579154c6f16e1b2b4 h: refs/heads/master i: 361531: 84545ab6690f0c7b5cc9a99725d9ead3a2cb7cc6 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/core/object.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b17dd3989ff..6b555f409481 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 804ca90f3fe35dd7c12889eaa74a44abbc4b91fd +refs/heads/master: 4fa133954e91b83cfa22947579154c6f16e1b2b4 diff --git a/trunk/drivers/gpu/drm/nouveau/core/core/object.c b/trunk/drivers/gpu/drm/nouveau/core/core/object.c index 0daab62ea14c..3b2e7b6304d3 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/core/object.c +++ b/trunk/drivers/gpu/drm/nouveau/core/core/object.c @@ -278,7 +278,6 @@ nouveau_object_del(struct nouveau_object *client, u32 _parent, u32 _handle) struct nouveau_object *parent = NULL; struct nouveau_object *namedb = NULL; struct nouveau_handle *handle = NULL; - int ret = -EINVAL; parent = nouveau_handle_ref(client, _parent); if (!parent) @@ -295,7 +294,7 @@ nouveau_object_del(struct nouveau_object *client, u32 _parent, u32 _handle) } nouveau_object_ref(NULL, &parent); - return ret; + return handle ? 0 : -EINVAL; } int