From 0afda25848a0ad0df00a554cb804145813ded427 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 15 Mar 2009 22:10:39 +0100
Subject: [PATCH] --- yaml --- r: 140965 b: refs/heads/master c:
 59f586db98919d7d9c43527b26c8de1cdf9ed912 h: refs/heads/master i:   140963:
 07be84189e4fdc80636da60f6cdf720e0bf75faf v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 	}