From 4f3d5bc267a89caa2f27016eb1bc234bd72a7f47 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Tue, 19 Jun 2012 17:47:52 +0200
Subject: [PATCH] --- yaml --- r: 323715 b: refs/heads/master c:
 92d8d4a8b0f4c6eba70f6e62b48e38bd005a56e6 h: refs/heads/master i:   323713:
 b54c5b8a0ccf6c9a0b82c29dad44c25c90c54608   323711:
 2fe474357630908c5d6553c1a3ba57e0a50a0f48 v: v3

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

diff --git a/[refs] b/[refs]
index 2ededb503e8b..c49be0cd9bac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c18c10bde65b6dcaffab7a4d040285e4defa49b
+refs/heads/master: 92d8d4a8b0f4c6eba70f6e62b48e38bd005a56e6
diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c
index 431dba8b7542..c154797a7ff7 100644
--- a/trunk/kernel/trace/trace_events_filter.c
+++ b/trunk/kernel/trace/trace_events_filter.c
@@ -2002,7 +2002,7 @@ static int ftrace_function_set_regexp(struct ftrace_ops *ops, int filter,
 static int __ftrace_function_set_filter(int filter, char *buf, int len,
 					struct function_filter_data *data)
 {
-	int i, re_cnt, ret;
+	int i, re_cnt, ret = -EINVAL;
 	int *reset;
 	char **re;