commit 81b857f3a21f3ae96a5ec72e54982fe30278049f
author Daniel Rosenberg <drosen@google.com> Tue Sep 16 20:08:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 16 20:08:01 2014 +0000
tree 92b4e0474b5b3d0d50737db3f7b87a9f74fcb405
parent a5ab96eb50f27989240ab8917e8ebf3a028bcdfb
parent 015d73ff4e12e0ae3a5c44ed2f69d24cbe7982d3

Merge "fastboot: Remove tos from flashall" into lmp-dev

adb/usb_osx.c

diff --git a/adb/usb_osx.c b/adb/usb_osx.c
index 45ce444..ca4f2af 100644
--- a/adb/usb_osx.c
+++ b/adb/usb_osx.c
@@ -512,14 +512,18 @@
         return -1;
     }
 
-    result =
-      (*handle->interface)->ReadPipe(handle->interface,
-                                    handle->bulkIn, buf, &numBytes);
+    result = (*handle->interface)->ReadPipe(handle->interface, handle->bulkIn, buf, &numBytes);
 
-    if (0 == result)
+    if (kIOUSBPipeStalled == result) {
+        DBG(" Pipe stalled, clearing stall.\n");
+        (*handle->interface)->ClearPipeStall(handle->interface, handle->bulkIn);
+        result = (*handle->interface)->ReadPipe(handle->interface, handle->bulkIn, buf, &numBytes);
+    }
+
+    if (kIOReturnSuccess == result)
         return 0;
     else {
-        DBG("ERR: usb_read failed with status %d\n", result);
+        DBG("ERR: usb_read failed with status %x\n", result);
     }
 
     return -1;