Commit 2a91e897 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'linux-kselftest-kunit-fixes-6.1-rc3' of...

Merge tag 'linux-kselftest-kunit-fixes-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull KUnit fixes from Shuah Khan:
 "One single fix to update alloc_string_stream() callers to check for
  IS_ERR() instead of NULL to be in sync with alloc_string_stream()
  returning an ERR_PTR()"

* tag 'linux-kselftest-kunit-fixes-6.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: update NULL vs IS_ERR() tests
parents 21c92498 61888776
...@@ -56,8 +56,8 @@ int string_stream_vadd(struct string_stream *stream, ...@@ -56,8 +56,8 @@ int string_stream_vadd(struct string_stream *stream,
frag_container = alloc_string_stream_fragment(stream->test, frag_container = alloc_string_stream_fragment(stream->test,
len, len,
stream->gfp); stream->gfp);
if (!frag_container) if (IS_ERR(frag_container))
return -ENOMEM; return PTR_ERR(frag_container);
len = vsnprintf(frag_container->fragment, len, fmt, args); len = vsnprintf(frag_container->fragment, len, fmt, args);
spin_lock(&stream->lock); spin_lock(&stream->lock);
......
...@@ -265,7 +265,7 @@ static void kunit_fail(struct kunit *test, const struct kunit_loc *loc, ...@@ -265,7 +265,7 @@ static void kunit_fail(struct kunit *test, const struct kunit_loc *loc,
kunit_set_failure(test); kunit_set_failure(test);
stream = alloc_string_stream(test, GFP_KERNEL); stream = alloc_string_stream(test, GFP_KERNEL);
if (!stream) { if (IS_ERR(stream)) {
WARN(true, WARN(true,
"Could not allocate stream to print failed assertion in %s:%d\n", "Could not allocate stream to print failed assertion in %s:%d\n",
loc->file, loc->file,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment