commit 4b22ed37ab2c9195b1228a524ba636b83d03ffb3
author Esteban de la Canal <estebandlc@google.com> Sat Sep 13 02:25:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 13 02:25:15 2014 +0000
tree 3a3e98db448c2c792232272a3aae4536625b3167
parent 05337da304bcb39db3d188f7c501b6d809373164
parent da5b2d67faeb2a85f042cf5b23d9875ad3413183

am da5b2d67: am 99bb69c1: am f41ee3d5: Merge "74602: Fixes adb not seeing connected devices on Mac."

* commit 'da5b2d67faeb2a85f042cf5b23d9875ad3413183':
  74602: Fixes adb not seeing connected devices on Mac.

adb/usb_osx.c

diff --git a/adb/usb_osx.c b/adb/usb_osx.c
index 5efb23b..ee893f5 100644
--- a/adb/usb_osx.c
+++ b/adb/usb_osx.c
@@ -513,14 +513,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;