diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:20:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:20:17 +0100 |
| commit | 281b3714e91162b66add1cfac404cf7b81e3e2f2 (patch) | |
| tree | 9f80453153db272c207129d971e17d31a6bb214a /kernel/trace/trace_events.c | |
| parent | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 (diff) | |
| parent | 7b60997f73865b019e595720185c85285ca3df9a (diff) | |
Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/core
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index c2a3077b7353..3f972ad98d04 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -60,10 +60,8 @@ int trace_define_field(struct ftrace_event_call *call, const char *type, return 0; err: - if (field) { + if (field) kfree(field->name); - kfree(field->type); - } kfree(field); return -ENOMEM; |