From 0fcc833cb49b563be03bb51d471668a9ed4322c2 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Wed, 24 Feb 2010 15:40:26 +0800
Subject: [PATCH] --- yaml --- r: 182306 b: refs/heads/master c:
 7b60997f73865b019e595720185c85285ca3df9a h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/kernel/trace/trace_events.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 826828fe0557..5efb9573a4a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c85f3a91f84d5a85f179c2504bb7a39370c82b41
+refs/heads/master: 7b60997f73865b019e595720185c85285ca3df9a
diff --git a/trunk/kernel/trace/trace_events.c b/trunk/kernel/trace/trace_events.c
index c2a3077b7353..3f972ad98d04 100644
--- a/trunk/kernel/trace/trace_events.c
+++ b/trunk/kernel/trace/trace_events.c
@@ -60,10 +60,8 @@ int trace_define_field(struct ftrace_event_call *call, const char *type,
 	return 0;
 
 err:
-	if (field) {
+	if (field)
 		kfree(field->name);
-		kfree(field->type);
-	}
 	kfree(field);
 
 	return -ENOMEM;