diff --git a/[refs] b/[refs]
index fb7af14bf346..16e44ab46c33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ea1c4156bf9e2eb370cc5c6fa6eb112bd844dec
+refs/heads/master: 59f586db98919d7d9c43527b26c8de1cdf9ed912
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index efe3202c0209..c0cf946d42f5 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -2494,7 +2494,7 @@ static int tracing_set_tracer(const char *buf)
 	if (!ring_buffer_expanded) {
 		ret = tracing_resize_ring_buffer(trace_buf_size);
 		if (ret < 0)
-			return ret;
+			goto out;
 		ret = 0;
 	}