commit f41ee3d5a1f236b0770d1ebd7068606aea7288bd
author Esteban de la Canal <estebandlc@google.com> Fri Sep 12 21:11:13 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 12 21:11:14 2014 +0000
tree 4cf56f1e2c8f4adc11391fa3481756a81bfcf199
parent e18ed89eae41f9be0f4ddfc77a3c4d68c901925f
parent 9dd83dc96e2f4d86093bc64d934d6c60c18d1edb

Merge "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;