diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 4cb3ad0a..4862e868 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-27  Kolja Waschk <kawk>
+
+   * src/tap/cable/generic.c (generic_flush_one_by_one): Always flush,
+       don't let the queue grow unnecessarily.
+
 2008-02-27  Jie Zhang  <jie.zhang@analog.com>
 
    * include/bus.h: Don't include chain.h.
diff --git a/jtag/src/tap/cable/generic.c b/jtag/src/tap/cable/generic.c
index 092d2fe7..251f9226 100644
--- a/jtag/src/tap/cable/generic.c
+++ b/jtag/src/tap/cable/generic.c
@@ -173,7 +173,8 @@ do_one_queued_action( cable_t *cable )
 void
 generic_flush_one_by_one( cable_t *cable, cable_flush_amount_t how_much )
 {
-    if( how_much == OPTIONALLY ) return;
+	/* This will flush always, even if how_much == OPTIONALLY,
+     * because there is no reason to let the queue grow */
 
 	while( do_one_queued_action( cable ) );
 }