From 30705be4ba09b38b14fe889774b72ac0b9494320 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Mon, 11 Jun 2012 15:28:53 +0900
Subject: [PATCH] --- yaml --- r: 312319 b: refs/heads/master c:
 50d8f9e393c5a1a8864fda75e3a9f2b800497a61 h: refs/heads/master i:   312317:
 d71d97548cebacc8a9c276f613b59f1717242ff4   312315:
 ed1475ef4942b6f63192e26cb5cf5965d9359371   312311:
 422d71a152c25dae0952cd651d60bda181dcd1c1   312303:
 4e082267068a276207928471cde1f2fc8b7b8c8b   312287:
 65c74399538d12d57e2e070099630c1831749ef0   312255:
 04ed2d13bdb9ef166ca04058e18180bb886315a2   312191:
 8a5691055baf932140694f2aa91a3de17d908ddc   312063:
 3a21233878b83d5ece892ad002ecd7753d18c3d8   311807:
 052eac703133dd4e1b897503491c4db78c0486f9   311295:
 de550706fd0d95da2db70795dad6a9a747602e17 v: v3

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

diff --git a/[refs] b/[refs]
index 87b9a3de432f..7f0fc87a49c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e080e6f1c863242ff709046d0486d09c46dc484a
+refs/heads/master: 50d8f9e393c5a1a8864fda75e3a9f2b800497a61
diff --git a/trunk/tools/lib/traceevent/event-parse.c b/trunk/tools/lib/traceevent/event-parse.c
index b1abd39923d6..83f0a8add177 100644
--- a/trunk/tools/lib/traceevent/event-parse.c
+++ b/trunk/tools/lib/traceevent/event-parse.c
@@ -616,7 +616,9 @@ static struct event_format *alloc_event(void)
 {
 	struct event_format *event;
 
-	event = malloc_or_die(sizeof(*event));
+	event = malloc(sizeof(*event));
+	if (!event)
+		return NULL;
 	memset(event, 0, sizeof(*event));
 
 	return event;