From d2921096e707bdde92bc635cd89ec1fe85a9faee Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Mon, 13 Jul 2020 15:25:51 +0100 Subject: [PATCH] drm/i915/selftest: fix an error return path where err is not being set There is an error condition where err is not being set and an uninitialized garbage value in err is being returned. Fix this by assigning err to an appropriate error return value before taking the error exit path. Addresses-Coverity: ("Uninitialized scalar value") Fixes: ed2690a9ca89 ("drm/i915/selftest: Check that GPR are restored across noa_wait") Signed-off-by: Colin Ian King Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20200713142551.423649-1-colin.king@canonical.com --- drivers/gpu/drm/i915/selftests/i915_perf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c index deb6dec..0aa1515 100644 --- a/drivers/gpu/drm/i915/selftests/i915_perf.c +++ b/drivers/gpu/drm/i915/selftests/i915_perf.c @@ -328,6 +328,7 @@ static int live_noa_gpr(void *arg) /* Fill the 16 qword [32 dword] GPR with a known unlikely value */ cs = intel_ring_begin(rq, 2 * 32 + 2); if (IS_ERR(cs)) { + err = PTR_ERR(cs); i915_request_add(rq); goto out_rq; } -- 2.7.4