--- libaitsched/src/hooks.c	2012/01/24 14:04:58	1.3.4.2
+++ libaitsched/src/hooks.c	2012/01/24 14:51:03	1.3.4.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: hooks.c,v 1.3.4.2 2012/01/24 14:04:58 misho Exp $
+* $Id: hooks.c,v 1.3.4.3 2012/01/24 14:51:03 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -309,7 +309,7 @@ retry:
 		r->root_wait = mtmp;
 	} else {
 		/* set wait INFTIM */
-		r->root_wait.tv_sec = r->root_wait.tv_usec = -1;
+		r->root_wait.tv_sec = r->root_wait.tv_nsec = -1;
 	}
 #else
 	if (!TAILQ_FIRST(&r->root_eventlo) && (task = TAILQ_FIRST(&r->root_timer))) {
@@ -329,8 +329,10 @@ retry:
 
 	if (r->root_wait.tv_sec != -1 && r->root_wait.tv_nsec != -1)
 		timeout = &r->root_wait;
-	else	/* wait INFTIM */
+	else if (r->root_poll.tv_sec == -1 && r->root_poll.tv_nsec == -1)
 		timeout = NULL;
+	else
+		timeout = &r->root_poll;
 	if ((en = kevent(r->root_kq, NULL, 0, res, KQ_EVENTS, timeout)) == -1) {
 		if (r->root_hooks.hook_exec.exception) {
 			if (r->root_hooks.hook_exec.exception(r, NULL))