diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2016-07-22 17:17:48 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2016-07-22 13:51:49 -0400 |
| commit | d9a7ed770f9d06b998172e4e71791c81476de88f (patch) | |
| tree | 6d5b1f415e236ecfc8b9aa8677b396040cb62e31 /drivers/gpu/drm/etnaviv | |
| parent | 8c6e6188703d81c2b926566009901d21a8fdb94d (diff) | |
| download | talos-op-linux-d9a7ed770f9d06b998172e4e71791c81476de88f.tar.gz talos-op-linux-d9a7ed770f9d06b998172e4e71791c81476de88f.zip | |
drm/etnaviv: Optimize error handling in etnaviv_gem_new_userptr()
Refactor this function implementation so that the
drm_gem_object_unreference_unlocked() function will only be called once
in case of a failure according to the Linux coding style recommendation
for centralized exiting of functions.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[seanpaul tweaked subject]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/4af34ce6-62c6-7966-1ae3-0877d5ac909d@users.sourceforge.net
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gem.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 356056ab63d7..56fb8637bb57 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -913,15 +913,12 @@ int etnaviv_gem_new_userptr(struct drm_device *dev, struct drm_file *file, get_task_struct(current); ret = etnaviv_gem_obj_add(dev, &etnaviv_obj->base); - if (ret) { - drm_gem_object_unreference_unlocked(&etnaviv_obj->base); - return ret; - } + if (ret) + goto unreference; ret = drm_gem_handle_create(file, &etnaviv_obj->base, handle); - +unreference: /* drop reference from allocate - handle holds it now */ drm_gem_object_unreference_unlocked(&etnaviv_obj->base); - return ret; } |
