diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-14 15:35:28 +1100 |
| commit | f600c997a1e930c3be312fdc4d1a67979d89173e (patch) | |
| tree | 352f5d35d672887a5552730cb71af9d3f068fe19 /drivers/gpu/drm/sis/sis_mm.c | |
| parent | 065957b017e290977dc5527ae4e21cff9d3fb5ec (diff) | |
| parent | 0ef183f7f162a62662f6002b03bcf3ca2903c937 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/gpu/drm/sis/sis_mm.c')
| -rw-r--r-- | drivers/gpu/drm/sis/sis_mm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index 2b2f78c428af..9a43d98e5003 100644 --- a/drivers/gpu/drm/sis/sis_mm.c +++ b/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); |