summaryrefslogtreecommitdiff
path: root/tools/perf/util/parse-events.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-03-08 12:26:07 +0100
committerIngo Molnar <mingo@kernel.org>2016-03-08 12:26:07 +0100
commitfe36d8912c8e402c62ce5a8712b6a47baae1ceaa (patch)
treef8394fd1dbb10b2d075e74d0f6b09ec29c795fe6 /tools/perf/util/parse-events.c
parent16a8083cedbe628228dbb08fc1469c70e6208619 (diff)
parente2857b8f11a289ed2b61d18d0665e05c1053c446 (diff)
downloadlinux-next-fe36d8912c8e402c62ce5a8712b6a47baae1ceaa.tar.gz
linux-next-fe36d8912c8e402c62ce5a8712b6a47baae1ceaa.zip
Merge branch 'linus' into irq/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/parse-events.c')
-rw-r--r--tools/perf/util/parse-events.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 4f7b0efdde2f..813d9b272c81 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -399,6 +399,9 @@ static void tracepoint_error(struct parse_events_error *e, int err,
{
char help[BUFSIZ];
+ if (!e)
+ return;
+
/*
* We get error directly from syscall errno ( > 0),
* or from encoded pointer's error ( < 0).