diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index b46ef236424d3d567439e783d8047611efd02a1c..b0f54d4c663b1a854a9be3ab78edce65b78ed235 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -1146,14 +1146,11 @@ static void klp_init_object_early(struct klp_patch *patch,
 #endif
 }
 
-static int klp_init_patch_early(struct klp_patch *patch)
+static void klp_init_patch_early(struct klp_patch *patch)
 {
 	struct klp_object *obj;
 	struct klp_func *func;
 
-	if (!patch->objs)
-		return -EINVAL;
-
 	INIT_LIST_HEAD(&patch->list);
 	INIT_LIST_HEAD(&patch->obj_list);
 	kobject_init(&patch->kobj, &klp_ktype_patch);
@@ -1163,26 +1160,12 @@ static int klp_init_patch_early(struct klp_patch *patch)
 	init_completion(&patch->finish);
 
 	klp_for_each_object_static(patch, obj) {
-		if (!obj->funcs)
-			return -EINVAL;
-
 		klp_init_object_early(patch, obj);
 
 		klp_for_each_func_static(obj, func) {
 			klp_init_func_early(obj, func);
 		}
 	}
-
-	/*
-	 * For stop_machine model, we only need to module_get and module_put once when
-	 * enable_patch and disable_patch respectively.
-	 */
-#ifdef CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY
-	if (!try_module_get(patch->mod))
-		return -ENODEV;
-#endif
-
-	return 0;
 }
 
 static int klp_init_patch(struct klp_patch *patch)
@@ -1431,10 +1414,16 @@ static int __klp_enable_patch(struct klp_patch *patch)
 int klp_enable_patch(struct klp_patch *patch)
 {
 	int ret;
+	struct klp_object *obj;
 
-	if (!patch || !patch->mod)
+	if (!patch || !patch->mod || !patch->objs)
 		return -EINVAL;
 
+	klp_for_each_object_static(patch, obj) {
+		if (!obj->funcs)
+			return -EINVAL;
+	}
+
 	if (!is_livepatch_module(patch->mod)) {
 		pr_err("module %s is not marked as a livepatch module\n",
 		       patch->mod->name);
@@ -1458,11 +1447,10 @@ int klp_enable_patch(struct klp_patch *patch)
 		return -EINVAL;
 	}
 
-	ret = klp_init_patch_early(patch);
-	if (ret) {
-		mutex_unlock(&klp_mutex);
-		return ret;
-	}
+	if (!try_module_get(patch->mod))
+		return -ENODEV;
+
+	klp_init_patch_early(patch);
 
 	ret = klp_init_patch(patch);
 	if (ret)
@@ -1609,10 +1597,16 @@ static int __klp_enable_patch(struct klp_patch *patch)
 int klp_register_patch(struct klp_patch *patch)
 {
 	int ret;
+	struct klp_object *obj;
 
-	if (!patch || !patch->mod)
+	if (!patch || !patch->mod || !patch->objs)
 		return -EINVAL;
 
+	klp_for_each_object_static(patch, obj) {
+		if (!obj->funcs)
+			return -EINVAL;
+	}
+
 	if (!is_livepatch_module(patch->mod)) {
 		pr_err("module %s is not marked as a livepatch module\n",
 			patch->mod->name);
@@ -1629,11 +1623,7 @@ int klp_register_patch(struct klp_patch *patch)
 		return -EINVAL;
 	}
 
-	ret = klp_init_patch_early(patch);
-	if (ret) {
-		mutex_unlock(&klp_mutex);
-		return ret;
-	}
+	klp_init_patch_early(patch);
 
 	ret = klp_init_patch(patch);
 	if (ret)