X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Frbtree.c;h=48499c2d88ccf16d65c8891e3fc5a23e8cdf283a;hb=8f55c1e51fbb03998708bdd97d5b6665ab92462d;hp=1e55ba1c2edfac510c41c87e47e7849f99a5f3b3;hpb=2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142;p=linux-2.6-omap-h63xx.git

diff --git a/lib/rbtree.c b/lib/rbtree.c
index 1e55ba1c2ed..48499c2d88c 100644
--- a/lib/rbtree.c
+++ b/lib/rbtree.c
@@ -322,6 +322,9 @@ struct rb_node *rb_next(struct rb_node *node)
 {
 	struct rb_node *parent;
 
+	if (rb_parent(node) == node)
+		return NULL;
+
 	/* If we have a right-hand child, go down and then left as far
 	   as we can. */
 	if (node->rb_right) {
@@ -348,6 +351,9 @@ struct rb_node *rb_prev(struct rb_node *node)
 {
 	struct rb_node *parent;
 
+	if (rb_parent(node) == node)
+		return NULL;
+
 	/* If we have a left-hand child, go down and then right as far
 	   as we can. */
 	if (node->rb_left) {