From 63994279f84e94a2df4b6511c866145c05b19106 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 14 Oct 2009 15:43:41 -0400
Subject: [PATCH] --- yaml --- r: 169503 b: refs/heads/master c:
 0d1da915c76838c9ee7af7cdefbcb2bae9424161 h: refs/heads/master i:   169501:
 e1c97ff1d1db6883de5c7ca809436d2ecea54811   169499:
 7a36188431de0694a5ac7ec993b0029367d10211   169495:
 c9a8d34ec1f2c36e5e58153d91cfe1f485b902d8   169487:
 cf644a8db105b1596be4b0f08d358e150d68c296   169471:
 81ebf2682c2b1c5ab9ba474f871d8bb3e1921e0f v: v3

---
 [refs]                                    | 2 +-
 trunk/tools/perf/util/trace-event-parse.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c25c4ee1380d..0ce10ef6717b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa1895561645103d8f8059b35d9c06e6eeead2e
+refs/heads/master: 0d1da915c76838c9ee7af7cdefbcb2bae9424161
diff --git a/trunk/tools/perf/util/trace-event-parse.c b/trunk/tools/perf/util/trace-event-parse.c
index 93a82fead958..c174765d4056 100644
--- a/trunk/tools/perf/util/trace-event-parse.c
+++ b/trunk/tools/perf/util/trace-event-parse.c
@@ -1819,7 +1819,7 @@ static int event_read_print(struct event *event)
 	if (ret < 0)
 		return -1;
 
-	return 0;
+	return ret;
 
  fail:
 	free_token(token);
@@ -3088,6 +3088,9 @@ int parse_ftrace_file(char *buf, unsigned long size)
 	if (ret < 0)
 		die("failed to read ftrace event print fmt");
 
+	/* New ftrace handles args */
+	if (ret > 0)
+		return 0;
 	/*
 	 * The arguments for ftrace files are parsed by the fields.
 	 * Set up the fields as their arguments.