diff --git a/[refs] b/[refs]
index e0e07ba747e3..cd02a01ac946 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1d52d0b85854958c7e78c8006e39aadb6ce4b8
+refs/heads/master: 2fc1dfbe17e7705c55b7a99da995fa565e26f151
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index c0cf946d42f5..ae32d3b99b4b 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -4125,7 +4125,8 @@ __init static int tracer_alloc_buffers(void)
 				       &trace_panic_notifier);
 
 	register_die_notifier(&trace_die_notifier);
-	ret = 0;
+
+	return 0;
 
 out_free_cpumask:
 	free_cpumask_var(tracing_reader_cpumask);