Merge "Revert "Get fastboot working on OS X"" am: c8cad2cbfc

am: eaaca58053

Change-Id: I3719f866d364c3030536dd1590a1d0e6c777eff5
This commit is contained in:
Elliott Hughes 2017-02-03 18:48:07 +00:00 committed by android-build-merger
commit ce8eb8a7ec
1 changed files with 0 additions and 11 deletions

View File

@ -302,13 +302,6 @@ static int try_device(io_service_t device, usb_handle *handle) {
// 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);
if (kr != 0) {
ERR("GetDeviceVendor");
@ -381,16 +374,12 @@ static int try_device(io_service_t device, usb_handle *handle) {
goto error;
}
out:
(*dev)->USBDeviceClose(dev);
(*dev)->Release(dev);
return 0;
error:
if (dev != NULL) {
(*dev)->USBDeviceClose(dev);
(*dev)->Release(dev);
}