diff --git a/[refs] b/[refs]
index 6724b2bb1f08..305bc281c093 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 321efff7c3b7a26fa0522cb12b2af2ac82c05f1e
+refs/heads/master: 787e0617e5176176c494a787f1b0a5248a3db568
diff --git a/trunk/net/sched/sch_htb.c b/trunk/net/sched/sch_htb.c
index bb3ddd4784b1..6c058e3660c0 100644
--- a/trunk/net/sched/sch_htb.c
+++ b/trunk/net/sched/sch_htb.c
@@ -391,7 +391,7 @@ static inline void htb_add_class_to_row(struct htb_sched *q,
 /* If this triggers, it is a bug in this code, but it need not be fatal */
 static void htb_safe_rb_erase(struct rb_node *rb, struct rb_root *root)
 {
-	if (RB_EMPTY_NODE(rb)) {
+	if (!RB_EMPTY_NODE(rb)) {
 		WARN_ON(1);
 	} else {
 		rb_erase(rb, root);