From a2446eab91f66eb7cd9f6d8e2481b814e444d374 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 22 Sep 2009 13:54:28 +0800
Subject: [PATCH] --- yaml --- r: 166429 b: refs/heads/master c:
 79fe249c8368be35c9ca05982e80c68e959505e1 h: refs/heads/master i:   166427:
 91fdaa77930c1cf2c8c6b498891b3b288a4080a6 v: v3

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

diff --git a/[refs] b/[refs]
index 85e0974c26c8..184f1686be7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1eb90f138b3fb4cc15f3acec94aa788e846269f7
+refs/heads/master: 79fe249c8368be35c9ca05982e80c68e959505e1
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 5c5cb9be8e8c..e70af98bb99c 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/kernel/trace/ftrace.c
@@ -1621,8 +1621,10 @@ ftrace_regex_open(struct inode *inode, struct file *file, int enable)
 		if (!ret) {
 			struct seq_file *m = file->private_data;
 			m->private = iter;
-		} else
+		} else {
+			trace_parser_put(&iter->parser);
 			kfree(iter);
+		}
 	} else
 		file->private_data = iter;
 	mutex_unlock(&ftrace_regex_lock);