Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[platform/kernel/linux-starfive.git] / kernel / tracepoint.c

diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c
index ef42c1a..f23144a 100644 (file)
--- a/kernel/tracepoint.c
+++ b/kernel/tracepoint.c
@@ -640,7 +640,6 @@ static void tp_module_going_check_quiescent(struct tracepoint *tp, void *priv)
 static int tracepoint_module_coming(struct module *mod)
 {
        struct tp_module *tp_mod;
-       int ret = 0;
 
        if (!mod->num_tracepoints)
                return 0;
@@ -652,19 +651,18 @@ static int tracepoint_module_coming(struct module *mod)
         */
        if (trace_module_has_bad_taint(mod))
                return 0;
-       mutex_lock(&tracepoint_module_list_mutex);
+
        tp_mod = kmalloc(sizeof(struct tp_module), GFP_KERNEL);
-       if (!tp_mod) {
-               ret = -ENOMEM;
-               goto end;
-       }
+       if (!tp_mod)
+               return -ENOMEM;
        tp_mod->mod = mod;
+
+       mutex_lock(&tracepoint_module_list_mutex);
        list_add_tail(&tp_mod->list, &tracepoint_module_list);
        blocking_notifier_call_chain(&tracepoint_notify_list,
                        MODULE_STATE_COMING, tp_mod);
-end:
        mutex_unlock(&tracepoint_module_list_mutex);
-       return ret;
+       return 0;
 }
 
 static void tracepoint_module_going(struct module *mod)