Fix jlink usb_bulk_with_retries to return actual error codes.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1564 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 98e3111072d0add7ebbe1733dd150449e445766c..d2e8947c12b635efe77f66eb5180cc4e9c745ebc 100644 (file)
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -31,6 +31,7 @@
 
 #include <usb.h>
 #include <string.h>
+#include <errno.h>
 
 #include "log.h"
 
@@ -867,21 +868,17 @@ static int usb_bulk_with_retries(
                usb_dev_handle *dev, int ep,
                char *bytes, int size, int timeout)
 {
-       int rc = 0, tries = 3, this_size;
+       int tries = 3, count = 0;
 
-       while (tries && size) {
-
-               this_size = f(dev, ep, bytes, size, timeout);
-               if (this_size > 0) {
-                       
-                       size -= this_size;
-                       rc += this_size;
-                       bytes += this_size;
-
-               } else
-                       tries --;
+       while (tries && (count < size))
+       {
+               int result = f(dev, ep, bytes + count, size - count, timeout);
+               if (result > 0)
+                       count += result;
+               else if ((-ETIMEDOUT != result) || !--tries)
+                       return result;
        }
-       return rc;
+       return count;
 }
 
 static int wrap_usb_bulk_write(usb_dev_handle *dev, int ep,