openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Esteban de la Canal 2014-09-12 21:11:13 +00:00 committed by Gerrit Code Review
parent e18ed89eae 9dd83dc96e
commit f41ee3d5a1
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;