From 88333620a9d997b9ce1843901a808480d1f508ee Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 6 Apr 2012 00:48:02 +0200
Subject: [PATCH] --- yaml --- r: 304979 b: refs/heads/master c:
 a2525a0852d81b1cf1155d75d1e3db9682fee191 h: refs/heads/master i:   304977:
 9ca47c7159ea4eb31f8c55bdf6046a7d8fd11cfc   304975:
 99b587901dce688a17ddbb1fc5bc6ce4ff0bfa52 v: v3

---
 [refs]                                   |  2 +-
 trunk/tools/lib/traceevent/event-parse.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aa83907b7c46..f63183cd54a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14ffde0e966efab6724e2de3ab470b78d4e01109
+refs/heads/master: a2525a0852d81b1cf1155d75d1e3db9682fee191
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index cdb32c78d150..4d5092f67167 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -4960,13 +4960,20 @@ static void free_event(struct event_format *event)
  */
 void pevent_free(struct pevent *pevent)
 {
-	struct cmdline_list *cmdlist = pevent->cmdlist, *cmdnext;
-	struct func_list *funclist = pevent->funclist, *funcnext;
-	struct printk_list *printklist = pevent->printklist, *printknext;
+	struct cmdline_list *cmdlist, *cmdnext;
+	struct func_list *funclist, *funcnext;
+	struct printk_list *printklist, *printknext;
 	struct pevent_function_handler *func_handler;
 	struct event_handler *handle;
 	int i;
 
+	if (!pevent)
+		return;
+
+	cmdlist = pevent->cmdlist;
+	funclist = pevent->funclist;
+	printklist = pevent->printklist;
+
 	pevent->ref_count--;
 	if (pevent->ref_count)
 		return;