Commit aad87dff authored by Julia Lawall's avatar Julia Lawall Committed by Dave Airlie

drm/i915: Remove redundant test in error path.

The error path for object list being null is in the second goto target.
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent fede5c91
...@@ -2613,13 +2613,12 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, ...@@ -2613,13 +2613,12 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
"back to user (%d)\n", "back to user (%d)\n",
args->buffer_count, ret); args->buffer_count, ret);
err: err:
if (object_list != NULL) { for (i = 0; i < pinned; i++)
for (i = 0; i < pinned; i++) i915_gem_object_unpin(object_list[i]);
i915_gem_object_unpin(object_list[i]);
for (i = 0; i < args->buffer_count; i++)
drm_gem_object_unreference(object_list[i]);
for (i = 0; i < args->buffer_count; i++)
drm_gem_object_unreference(object_list[i]);
}
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
pre_mutex_err: pre_mutex_err:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment