diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2012-03-15 13:58:31 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-24 04:50:20 -0400 |
| commit | f1ae126cdf1d1514da6e89a248232a7f7d315fe0 (patch) | |
| tree | b698a6cfeb735df7873865614f5f834fbcdaace9 /drivers/gpu/drm/drm_gem.c | |
| parent | 343d4a79fdaeb8753201324c03fbc108f4e62636 (diff) | |
drm: Unify and fix idr error handling
The error handling code w.r.t. idr usage looks inconsistent.
In the case of drm_mode_object_get() and drm_ctxbitmap_next() the error
handling is also incomplete.
Unify the code to follow the same pattern always.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/drm_gem.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 83114b5e3cee..fc6ded8f318b 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
| @@ -272,8 +272,7 @@ again: | |||
| 272 | spin_unlock(&file_priv->table_lock); | 272 | spin_unlock(&file_priv->table_lock); |
| 273 | if (ret == -EAGAIN) | 273 | if (ret == -EAGAIN) |
| 274 | goto again; | 274 | goto again; |
| 275 | 275 | else if (ret) | |
| 276 | if (ret != 0) | ||
| 277 | return ret; | 276 | return ret; |
| 278 | 277 | ||
| 279 | drm_gem_object_handle_reference(obj); | 278 | drm_gem_object_handle_reference(obj); |
| @@ -456,8 +455,7 @@ again: | |||
| 456 | 455 | ||
| 457 | if (ret == -EAGAIN) | 456 | if (ret == -EAGAIN) |
| 458 | goto again; | 457 | goto again; |
| 459 | 458 | else if (ret) | |
| 460 | if (ret != 0) | ||
| 461 | goto err; | 459 | goto err; |
| 462 | 460 | ||
| 463 | /* Allocate a reference for the name table. */ | 461 | /* Allocate a reference for the name table. */ |