From 309ee5fffd67b08449d5c917acdc2d44b30c2632 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 4 Aug 2022 16:58:18 +0200 Subject: [PATCH] Revert "ANDROID: GKI: Return ERROR value on KUnit load fail" This reverts commit 39f5348cf70dfd92d7d1c2ba1872d4a5e6cfd864 as it conflicts with upstream kunit changes in 6.0-rc1. If this is still needed, please submit upstream. Bug: 231160619 Cc: Joe Fradley Signed-off-by: Greg Kroah-Hartman Change-Id: I17cc72883f87ab7647cc9e21e7770f79f5400a65 --- lib/kunit/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 8175c83b8af6..197316352258 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -595,7 +595,7 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites) if (!enable_param) { pr_info("kunit: deactivated, cannot load %s\n", suites != NULL ? suites[0]->name : "NULL"); - return -EPERM; + return -1; } for (i = 0; suites[i] != NULL; i++) {