---

yaml --- r: 146195 b: refs/heads/master c: e162280 h: refs/heads/master i: 146193: 2da4848 146191: b357649 v: v3
git-mirror · Jun 1, 2009 · bd8548b · bd8548b
1 parent 877d9b1
commit bd8548b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;