ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit 'f41ee3d5a1f236b0770d1ebd7068606aea7288bd':
  74602: Fixes adb not seeing connected devices on Mac.
This commit is contained in:
Esteban de la Canal 2014-09-12 21:26:49 +00:00 • committed by Android Git Automerger
commit 99bb69c1ce
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
adb/usb_osx.c
View file

@ -513,14 +513,18 @@ int usb_read(usb_handle *handle, void *buf, int len)
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;