[PATCH] drm/i915: Fix the static code analysis warning
Mika Kahola
mika.kahola at intel.com
Tue Jan 15 13:33:18 UTC 2019
Fixes branch past initialization warning on static code analysis
Signed-off-by: Mika Kahola <mika.kahola at intel.com>
---
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index e7994505d850..a7c4308d1d13 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1603,11 +1603,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
if (__copy_from_user((char *)relocs + copied,
(char __user *)urelocs + copied,
len)) {
-end_user:
- user_access_end();
- kvfree(relocs);
- err = -EFAULT;
- goto err;
+ goto end_user;
}
copied += len;
@@ -1637,6 +1633,12 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
return 0;
+end_user:
+ user_access_end();
+ kvfree(relocs);
+ err = -EFAULT;
+ goto err;
+
err:
while (i--) {
struct drm_i915_gem_relocation_entry *relocs =
--
2.17.1
More information about the Intel-gfx-trybot
mailing list