From 1ed391a695cccac89e13c1e4d5bdb1a92d52b925 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Wed, 1 Sep 2010 12:58:43 +0200
Subject: [PATCH] --- yaml --- r: 210538 b: refs/heads/master c:
 9cb627d5f38830ca19aa0dca52d1d3a633018bf7 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/kernel/trace/trace_event_perf.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eedb71b373b9..68bc7f35fa36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da34634fd39958725310d2c30c9b4543945f968b
+refs/heads/master: 9cb627d5f38830ca19aa0dca52d1d3a633018bf7
diff --git a/trunk/kernel/trace/trace_event_perf.c b/trunk/kernel/trace/trace_event_perf.c
index 000e6e85b445..31cc4cb0dbf2 100644
--- a/trunk/kernel/trace/trace_event_perf.c
+++ b/trunk/kernel/trace/trace_event_perf.c
@@ -91,6 +91,8 @@ int perf_trace_init(struct perf_event *p_event)
 		    tp_event->class && tp_event->class->reg &&
 		    try_module_get(tp_event->mod)) {
 			ret = perf_trace_event_init(tp_event, p_event);
+			if (ret)
+				module_put(tp_event->mod);
 			break;
 		}
 	}
@@ -146,6 +148,7 @@ void perf_trace_destroy(struct perf_event *p_event)
 		}
 	}
 out:
+	module_put(tp_event->mod);
 	mutex_unlock(&event_mutex);
 }