diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-07-18 12:14:51 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-07-18 12:15:59 -0700 |
| commit | beb1097ec8bdf15e2fed3301920a719e0dd2250a (patch) | |
| tree | 026a9569edbac6e1387a0cd9d7574e8b74795c05 /drivers/gpu/drm/i915/selftests/mock_request.c | |
| parent | libbpf: Fix warning in calloc() usage (diff) | |
| parent | Merge tag 'pmdomain-v6.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-beb1097ec8bdf15e2fed3301920a719e0dd2250a.tar.gz linux-beb1097ec8bdf15e2fed3301920a719e0dd2250a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc6
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/mock_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/mock_request.c | 2 |
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; |