33 lines
953 B
Diff
33 lines
953 B
Diff
commit c3de45b0488762a9161e9b9e8bf419f63c100c47
|
|
Author: Eric Anholt <eric@anholt.net>
|
|
Date: Tue Sep 9 11:40:34 2008 -0700
|
|
|
|
DRM: Return -EBADF on bad object in flink, and return curent name if it exists.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
|
|
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
|
|
index 434155b..ccd1afd 100644
|
|
--- a/drivers/gpu/drm/drm_gem.c
|
|
+++ b/drivers/gpu/drm/drm_gem.c
|
|
@@ -251,7 +251,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data,
|
|
|
|
obj = drm_gem_object_lookup(dev, file_priv, args->handle);
|
|
if (obj == NULL)
|
|
- return -EINVAL;
|
|
+ return -EBADF;
|
|
|
|
again:
|
|
if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0)
|
|
@@ -259,8 +259,9 @@ again:
|
|
|
|
spin_lock(&dev->object_name_lock);
|
|
if (obj->name) {
|
|
+ args->name = obj->name;
|
|
spin_unlock(&dev->object_name_lock);
|
|
- return -EEXIST;
|
|
+ return 0;
|
|
}
|
|
ret = idr_get_new_above(&dev->object_name_idr, obj, 1,
|
|
&obj->name);
|