diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index cdcaf7ddd68d..5e060c78fbfb 100644
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -637,7 +637,7 @@ int register_ftrace_graph(struct fgraph_ops *gops)
 	static bool fgraph_initialized;
 	int ret = 0;
 
-	mutex_lock(&ftrace_lock);
+	guard(mutex)(&ftrace_lock);
 
 	if (!fgraph_initialized) {
 		ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "fgraph_idle_init",
@@ -651,10 +651,8 @@ int register_ftrace_graph(struct fgraph_ops *gops)
 	}
 
 	/* we currently allow only one tracer registered at a time */
-	if (ftrace_graph_active) {
-		ret = -EBUSY;
-		goto out;
-	}
+	if (ftrace_graph_active)
+		return -EBUSY;
 
 	register_pm_notifier(&ftrace_suspend_notifier);
 
@@ -662,7 +660,7 @@ int register_ftrace_graph(struct fgraph_ops *gops)
 	ret = start_graph_tracing();
 	if (ret) {
 		ftrace_graph_active--;
-		goto out;
+		return ret;
 	}
 
 	ftrace_graph_return = gops->retfunc;
@@ -678,8 +676,6 @@ int register_ftrace_graph(struct fgraph_ops *gops)
 	update_function_graph_func();
 
 	ret = ftrace_startup(&graph_ops, FTRACE_START_FUNC_RET);
-out:
-	mutex_unlock(&ftrace_lock);
 	return ret;
 }