Skip to content

Commit e354f67

Browse files
tititiou36tursulin
authored andcommitted
drm/i915: Fix an error handling path in igt_write_huge()
All error handling paths go to 'out', except this one. Be consistent and also branch to 'out' here. Fixes: c10a652 ("drm/i915/selftests: Rework context handling in hugepages selftests") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/7a036b88671312ee9adc01c74ef5b3376f690b76.1689619758.git.christophe.jaillet@wanadoo.fr (cherry picked from commit 361ecaa) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
1 parent 3844ed5 commit e354f67

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/gpu/drm/i915/gem/selftests/huge_pages.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,8 +1246,10 @@ static int igt_write_huge(struct drm_i915_private *i915,
12461246
* times in succession a possibility by enlarging the permutation array.
12471247
*/
12481248
order = i915_random_order(count * count, &prng);
1249-
if (!order)
1250-
return -ENOMEM;
1249+
if (!order) {
1250+
err = -ENOMEM;
1251+
goto out;
1252+
}
12511253

12521254
max_page_size = rounddown_pow_of_two(obj->mm.page_sizes.sg);
12531255
max = div_u64(max - size, max_page_size);

0 commit comments

Comments
 (0)