From bd8548b6bc1dc9e1f1dc1585f7c6b6667ac9a906 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Wed, 27 May 2009 11:04:48 +0800
Subject: [PATCH] --- yaml --- r: 146195 b: refs/heads/master c:
 e16228069083a2f6b94383ac5739aea7a0f38ce4 h: refs/heads/master i:   146193:
 2da48482c47fbd57aa17f2f286a636d0c626657a   146191:
 b3576498c68267834019d017ae7338fbb8eda3a7 v: v3

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

diff --git a/[refs] b/[refs]
index dc5179893e89..51cafc7c12fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3dd7ba7d862707800c7ac45068f14ade2b65155
+refs/heads/master: e16228069083a2f6b94383ac5739aea7a0f38ce4
diff --git a/trunk/kernel/trace/trace_stat.c b/trunk/kernel/trace/trace_stat.c
index 5816d1aebcc9..8030ec98dbad 100644
--- a/trunk/kernel/trace/trace_stat.c
+++ b/trunk/kernel/trace/trace_stat.c
@@ -60,8 +60,8 @@ static struct rb_node *release_next(struct rb_node *node)
 		return node->rb_right;
 	else {
 		if (!parent)
-			return NULL;
-		if (parent->rb_left == node)
+			;
+		else if (parent->rb_left == node)
 			parent->rb_left = NULL;
 		else
 			parent->rb_right = NULL;