summaryrefslogtreecommitdiff
path: root/lib/kunit/kunit-test.c
diff options
context:
space:
mode:
authorMaxime Ripard <mripard@kernel.org>2024-02-26 17:23:00 +0300
committerMaxime Ripard <mripard@kernel.org>2024-02-26 17:23:00 +0300
commit2f910859724b53f1cd3579246e3d9bebb16d78b8 (patch)
tree75cd2329b7e737865bf28ea734a2e0649c02a5bf /lib/kunit/kunit-test.c
parent86bf8cfda6d2a6720fa2e6e676c98f0882c9d3d7 (diff)
parent72fa02fdf83306c52bc1eede28359e3fa32a151a (diff)
downloadlinux-2f910859724b53f1cd3579246e3d9bebb16d78b8.tar.xz
Merge drm/drm-fixes into drm-misc-fixes
Sima needs a more recent release to apply a patch. Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'lib/kunit/kunit-test.c')
-rw-r--r--lib/kunit/kunit-test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c
index c4259d910356..f7980ef236a3 100644
--- a/lib/kunit/kunit-test.c
+++ b/lib/kunit/kunit-test.c
@@ -720,7 +720,7 @@ static void kunit_device_cleanup_test(struct kunit *test)
long action_was_run = 0;
test_device = kunit_device_register(test, "my_device");
- KUNIT_ASSERT_NOT_NULL(test, test_device);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, test_device);
/* Add an action to verify cleanup. */
devm_add_action(test_device, test_dev_action, &action_was_run);