diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-10 15:47:28 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-10 15:50:22 -0800 |
| commit | 9583c099b4a08b49e03f7b461c344b6d277fd262 (patch) | |
| tree | e3c17d4b9ee2c2a063c3e30e0a650fc0c9b6cfa7 /linux-core/drm_gem.c | |
| parent | c34539e8bb5568b1d6059abf139dd08e07e84eea (diff) | |
Revert "Merge branch 'modesetting-gem'"
This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208.
We really just want the libdrm and ioctl bits, not all the driver
stuff.
Diffstat (limited to 'linux-core/drm_gem.c')
| -rw-r--r-- | linux-core/drm_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_gem.c b/linux-core/drm_gem.c index 607c8b67..ce930265 100644 --- a/linux-core/drm_gem.c +++ b/linux-core/drm_gem.c @@ -105,6 +105,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size) kfree(obj); return NULL; } + kref_init(&obj->refcount); kref_init(&obj->handlecount); obj->size = size; @@ -263,9 +264,8 @@ again: spin_lock(&dev->object_name_lock); if (obj->name) { - args->name = (uint64_t) obj->name; spin_unlock(&dev->object_name_lock); - return 0; + return -EEXIST; } ret = idr_get_new_above(&dev->object_name_idr, obj, 1, &obj->name); |