diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:40:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-09 20:40:08 +0200 |
| commit | 2aa61274efb9f532deaebc9812675a27af1994cb (patch) | |
| tree | c2f70525dc152e0ddce60f1a3021473cc6a3f298 /kernel/trace/trace_event_perf.c | |
| parent | 359d5106a2ff4ffa2ba129ec8f54743c341dabfc (diff) | |
| parent | 5e11637e2c929e34dcc0fbbfb48bdb638937701a (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up pending fixes before applying dependent new changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_event_perf.c')
| -rw-r--r-- | kernel/trace/trace_event_perf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 92f5477a006a..f3bbcd1c90c8 100644 --- a/kernel/trace/trace_event_perf.c +++ b/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; } } @@ -147,6 +149,7 @@ void perf_trace_destroy(struct perf_event *p_event) } } out: + module_put(tp_event->mod); mutex_unlock(&event_mutex); } |