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

Merge "Get fastboot working on OS X"

Browse source
This commit is contained in:
Elliott Hughes 2015-08-20 00:44:30 +00:00 • committed by Gerrit Code Review
commit e728eb9150
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fastboot/usb_osx.cpp
View file

@ -293,6 +293,13 @@ static int try_device(io_service_t device, usb_handle *handle) {
// So, we have a device, finally. Grab its vitals. // So, we have a device, finally. Grab its vitals.
kr = (*dev)->USBDeviceOpen(dev);
if (kr != 0) {
WARN("USBDeviceOpen");
goto out;
}
kr = (*dev)->GetDeviceVendor(dev, &handle->info.dev_vendor); kr = (*dev)->GetDeviceVendor(dev, &handle->info.dev_vendor);
if (kr != 0) { if (kr != 0) {
ERR("GetDeviceVendor"); ERR("GetDeviceVendor");
@ -365,12 +372,16 @@ static int try_device(io_service_t device, usb_handle *handle) {
goto error; goto error;
} }
out:
(*dev)->USBDeviceClose(dev);
(*dev)->Release(dev); (*dev)->Release(dev);
return 0; return 0;
error: error:
if (dev != NULL) { if (dev != NULL) {
(*dev)->USBDeviceClose(dev);
(*dev)->Release(dev); (*dev)->Release(dev);
} }