summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/selftests/mock_request.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-21 17:53:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-21 17:53:33 +0300
commitbcbef1e4a626e093d4ead56593fb169eed5033c7 (patch)
treed17ab18b665433070a93c0cbd0d0291b0f262353 /drivers/gpu/drm/i915/selftests/mock_request.c
parent103f5d8c35b3d22b700f1f6d585e499b2df62df6 (diff)
parent89be9a83ccf1f88522317ce02f854f30d6115c41 (diff)
downloadlinux-bcbef1e4a626e093d4ead56593fb169eed5033c7.tar.xz
Merge tag 'v6.16-rc7' into tty-next
We need the tty/serial fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/mock_request.c')
-rw-r--r--drivers/gpu/drm/i915/selftests/mock_request.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/selftests/mock_request.c b/drivers/gpu/drm/i915/selftests/mock_request.c
index 09f747228dff..1b0cf073e964 100644
--- a/drivers/gpu/drm/i915/selftests/mock_request.c
+++ b/drivers/gpu/drm/i915/selftests/mock_request.c
@@ -35,7 +35,7 @@ mock_request(struct intel_context *ce, unsigned long delay)
/* NB the i915->requests slab cache is enlarged to fit mock_request */
request = intel_context_create_request(ce);
if (IS_ERR(request))
- return NULL;
+ return request;
request->mock.delay = delay;
return request;