diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f7c9c51ccd26..f45179252122 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -8672,8 +8672,10 @@ static int trace_array_create_dir(struct trace_array *tr)
 		return -EINVAL;
 
 	ret = event_trace_add_tracer(tr->dir, tr);
-	if (ret)
+	if (ret) {
 		tracefs_remove(tr->dir);
+		return ret;
+	}
 
 	init_tracer_tracefs(tr, tr->dir);
 	__update_tracer_options(tr);