diff --git a/[refs] b/[refs]
index 70b0a74bcd74..5c9c3e578fa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbb7a95d810ab76aac42e1a5cefdf069dcd014a1
+refs/heads/master: 1b5c0077e1615bb16e777a10ec1fc1195ba059ac
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index f89fd71ce92f..b820a0ae7355 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -698,14 +698,14 @@ static struct rb_node *htb_id_find_next_upper(int prio, struct rb_node *n,
 	while (n) {
 		struct htb_class *cl =
 		    rb_entry(n, struct htb_class, node[prio]);
-		if (id == cl->common.classid)
-			return n;
 
 		if (id > cl->common.classid) {
 			n = n->rb_right;
-		} else {
+		} else if (id < cl->common.classid) {
 			r = n;
 			n = n->rb_left;
+		} else {
+			return n;
 		}
 	}
 	return r;