|
@@ -148,17 +148,10 @@ int via_mem_alloc(struct drm_device *dev, void *data,
|
|
|
if (retval)
|
|
|
goto fail_alloc;
|
|
|
|
|
|
-again:
|
|
|
- if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) {
|
|
|
- retval = -ENOMEM;
|
|
|
- goto fail_idr;
|
|
|
- }
|
|
|
-
|
|
|
- retval = idr_get_new_above(&dev_priv->object_idr, item, 1, &user_key);
|
|
|
- if (retval == -EAGAIN)
|
|
|
- goto again;
|
|
|
- if (retval)
|
|
|
+ retval = idr_alloc(&dev_priv->object_idr, item, 1, 0, GFP_KERNEL);
|
|
|
+ if (retval < 0)
|
|
|
goto fail_idr;
|
|
|
+ user_key = retval;
|
|
|
|
|
|
list_add(&item->owner_list, &file_priv->obj_list);
|
|
|
mutex_unlock(&dev->struct_mutex);
|