From 783427a41470ef0e9e95921c9e0b3c9d9d11afd6 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 27 Feb 2013 17:04:11 -0800 Subject: [PATCH] --- yaml --- r: 359337 b: refs/heads/master c: ff512357fe1bf7f901bd0ea19fc718025dff6b07 h: refs/heads/master i: 359335: fb38a63b48d7b03be5481439d228feea19fd5001 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/sis/sis_mm.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 80155e3c0f37..fe9f720e555a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8c470afe316002d5d5259a134984ed03f40e249 +refs/heads/master: ff512357fe1bf7f901bd0ea19fc718025dff6b07 diff --git a/trunk/drivers/gpu/drm/sis/sis_mm.c b/trunk/drivers/gpu/drm/sis/sis_mm.c index 2b2f78c428af..9a43d98e5003 100644 --- a/trunk/drivers/gpu/drm/sis/sis_mm.c +++ b/trunk/drivers/gpu/drm/sis/sis_mm.c @@ -128,17 +128,10 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file, 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);