commit 647231a8d791082dd634fd67051523c4ba9c294e
author Esteban de la Canal <estebandlc@google.com> Thu Sep 11 11:02:17 2014 -0700
committer Esteban de la Canal <estebandlc@google.com> Thu Sep 11 11:36:50 2014 -0700
tree ffe576f0931946c681dd678abcbb2b098b5de7c3
parent 33ff03b87545258f809a87d045134be694fb4a53

74602: Fixes adb not seeing connected devices on Mac.

Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html

Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602

usb_osx.c

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