diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2022-10-14 12:37:25 +0300 |
---|---|---|
committer | Shuah Khan <skhan@linuxfoundation.org> | 2022-10-18 15:08:42 -0600 |
commit | 618887768bb71f0a475334fa5a4fba7dc98d7ab5 (patch) | |
tree | fcf7314223150ba06640e17526e1321cab3f7525 /lib/kunit | |
parent | 9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff) | |
download | lwn-618887768bb71f0a475334fa5a4fba7dc98d7ab5.tar.gz lwn-618887768bb71f0a475334fa5a4fba7dc98d7ab5.zip |
kunit: update NULL vs IS_ERR() tests
The alloc_string_stream() functions were changed from returning NULL on
error to returning error pointers so these caller needs to be updated
as well.
Fixes: 78b1c6584fce ("kunit: string-stream: Simplify resource use")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'lib/kunit')
-rw-r--r-- | lib/kunit/string-stream.c | 4 | ||||
-rw-r--r-- | lib/kunit/test.c | 2 |
2 files changed, 3 insertions, 3 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); diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 90640a43cf62..2a6992fe7c3e 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -265,7 +265,7 @@ static void kunit_fail(struct kunit *test, const struct kunit_loc *loc, kunit_set_failure(test); stream = alloc_string_stream(test, GFP_KERNEL); - if (!stream) { + if (IS_ERR(stream)) { WARN(true, "Could not allocate stream to print failed assertion in %s:%d\n", loc->file, |