Index: uspace/lib/usbhost/src/endpoint.c
===================================================================
--- uspace/lib/usbhost/src/endpoint.c	(revision 30fc56fcf79046c1edd07f48eb1fd808fe58d10b)
+++ uspace/lib/usbhost/src/endpoint.c	(revision 92caadde811e80acb043801082ba285f1443ec49)
@@ -130,5 +130,8 @@
 	assert(fibril_mutex_is_locked(&ep->guard));
 
-	while (ep->active_batch != NULL)
+	if (ep->active_batch != NULL)
+		fibril_condvar_wait_timeout(&ep->avail, &ep->guard, timeout);
+
+	while (timeout == 0 && ep->active_batch != NULL)
 		fibril_condvar_wait_timeout(&ep->avail, &ep->guard, timeout);
 }