commit 9dbcbe08751bacbf1fcbf6037fed1e6c69a27fa3
author Jean-Baptiste Queru <jbq@google.com> Fri May 11 21:58:10 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 11 21:58:10 2012 -0700
tree 0f8fb6c29ee63dfb688a44ac4dd486d5a60db91b
parent 94cb7adb899fdfa9b5b6aa8b8dff4ae01631087f
parent 9bdedb599874278abf206230ed31010eeb9b40dd

am 9bdedb59: am a36e1aa3: Merge "adb: usb_windows: fix adb connection lost issue"

* commit '9bdedb599874278abf206230ed31010eeb9b40dd':
  adb: usb_windows: fix adb connection lost issue

adb/usb_windows.c

diff --git a/adb/usb_windows.c b/adb/usb_windows.c
index b216999..251bf17 100644
--- a/adb/usb_windows.c
+++ b/adb/usb_windows.c
@@ -255,7 +255,7 @@
 }
 
 int usb_write(usb_handle* handle, const void* data, int len) {
-  unsigned long time_out = 500 + len * 8;
+  unsigned long time_out = 5000;
   unsigned long written = 0;
   int ret;
 
@@ -300,7 +300,7 @@
 }
 
 int usb_read(usb_handle *handle, void* data, int len) {
-  unsigned long time_out = 500 + len * 8;
+  unsigned long time_out = 0;
   unsigned long read = 0;
   int ret;
 
@@ -322,7 +322,7 @@
 
         if (len == 0)
           return 0;
-      } else if (saved_errno != ERROR_SEM_TIMEOUT) {
+      } else {
         // assume ERROR_INVALID_HANDLE indicates we are disconnected
         if (saved_errno == ERROR_INVALID_HANDLE)
           usb_kick(handle);