drm/i915/selftest: Fix error handling in igt_vma_remapped_gtt()

An inner scope version of err shadows the variable in the outer scope,
and err doesn't get set after a failure, fix these.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210325214808.2071517-3-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c
index 1b6125e4c1ac67c55ac56b7a2c4909db69319f86..35481cfbb635348ecb2c16c7eece175b4654986e 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_vma.c
+++ b/drivers/gpu/drm/i915/selftests/i915_vma.c
@@ -890,7 +890,6 @@ static int igt_vma_remapped_gtt(void *arg)
                        struct i915_vma *vma;
                        u32 __iomem *map;
                        unsigned int x, y;
-                       int err;
 
                        i915_gem_object_lock(obj, NULL);
                        err = i915_gem_object_set_to_gtt_domain(obj, true);
@@ -962,6 +961,7 @@ static int igt_vma_remapped_gtt(void *arg)
                                                       *t == I915_GGTT_VIEW_ROTATED ? "Rotated" : "Remapped",
                                                       val, exp);
                                                i915_vma_unpin_iomap(vma);
+                                               err = -EINVAL;
                                                goto out;
                                        }
                                }