From 01cefeaf8c37e76bc480ea89c9a6a37e0fc16dc8 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 8 Dec 2009 11:15:30 +0800
Subject: [PATCH] --- yaml --- r: 177340 b: refs/heads/master c:
 313254a9400d388b46150c0f355e216418a2f598 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ef3cce70f729..fff8d4c86374 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 311d16da575f53c3367099579736c1d233efe0dc
+refs/heads/master: 313254a9400d388b46150c0f355e216418a2f598
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 08a3fb5b3187..ff8aecdc6dd6 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -2208,10 +2208,9 @@ ftrace_regex_write(struct file *file, const char __user *ubuf,
 	    !trace_parser_cont(parser)) {
 		ret = ftrace_process_regex(parser->buffer,
 					   parser->idx, enable);
+		trace_parser_clear(parser);
 		if (ret)
 			goto out_unlock;
-
-		trace_parser_clear(parser);
 	}
 
 	ret = read;