summaryrefslogtreecommitdiff
path: root/tools/lib/traceevent/event-parse.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-20 09:49:41 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-20 09:49:41 +0900
commitcea35899a02226b70baeee7e179d7a7c6e814b98 (patch)
tree19621a7ae67df5f398071791d52489a464b1b30a /tools/lib/traceevent/event-parse.c
parent53971a86d2db89f32859dc26bd6594b5bc665d5b (diff)
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c (diff)
downloadlinux-cea35899a02226b70baeee7e179d7a7c6e814b98.tar.gz
linux-cea35899a02226b70baeee7e179d7a7c6e814b98.tar.xz
Merge 3.15-rc5 into usb-next
We need these USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/lib/traceevent/event-parse.c')
-rw-r--r--tools/lib/traceevent/event-parse.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index baec7d887da4..b83184f2d484 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -4344,6 +4344,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
format, len_arg, arg);
trace_seq_terminate(&p);
trace_seq_puts(s, p.buffer);
+ trace_seq_destroy(&p);
arg = arg->next;
break;
default: