From 294249bb106c10d768d1b57d05600ded2aba95d4 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 7 May 2009 15:11:15 +0800
Subject: [PATCH] --- yaml --- r: 146109 b: refs/heads/master c:
 d94fc523f3c35bd8013f04827e94756cbc0212f4 h: refs/heads/master i:   146107:
 782d18ea520f9ae739d49edd91475784dd782853 v: v3

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

diff --git a/[refs] b/[refs]
index bdfbc80baa75..9942b7a3a2c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5928c3cc0ffcb6894bbab6be591b7ae1786b2d87
+refs/heads/master: d94fc523f3c35bd8013f04827e94756cbc0212f4
diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c
index 8c62e5bdff09..85ad6a8939ad 100644
--- a/trunk/kernel/trace/trace_events_filter.c
+++ b/trunk/kernel/trace/trace_events_filter.c
@@ -636,14 +636,15 @@ static int filter_add_subsystem_pred(struct filter_parse_state *ps,
 
 		err = filter_add_pred(ps, call, pred);
 		if (err) {
+			mutex_unlock(&event_mutex);
 			filter_free_subsystem_preds(system);
 			parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0);
-			break;
+			goto out;
 		}
 		replace_filter_string(call->filter, filter_string);
 	}
 	mutex_unlock(&event_mutex);
-
+out:
 	return err;
 }