diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-24 11:05:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-24 11:05:43 +1000 |
| commit | d47f9580839eb6fe568e38b2084d94887fbf5ce0 (patch) | |
| tree | 2493555057f8e5c850590d7438fdbf4472666201 /lib/kunit/string-stream.c | |
| parent | 3d335a523b938a445a674be24d1dd5c7a4c86fb6 (diff) | |
| parent | eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 (diff) | |
Backmerge tag 'v6.1-rc6' into drm-next
Linux 6.1-rc6
This is needed for drm-misc-next and tegra.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'lib/kunit/string-stream.c')
| -rw-r--r-- | lib/kunit/string-stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c index f5ae79c37400..a608746020a9 100644 --- a/lib/kunit/string-stream.c +++ b/lib/kunit/string-stream.c @@ -56,8 +56,8 @@ int string_stream_vadd(struct string_stream *stream, frag_container = alloc_string_stream_fragment(stream->test, len, stream->gfp); - if (!frag_container) - return -ENOMEM; + if (IS_ERR(frag_container)) + return PTR_ERR(frag_container); len = vsnprintf(frag_container->fragment, len, fmt, args); spin_lock(&stream->lock); |