summaryrefslogtreecommitdiffstats
path: root/fastboot/usb_osx.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-02-03 18:40:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-03 18:40:46 +0000
commitc8cad2cbfc4cf04b04e6db22651719fb1140074a (patch)
tree691e68999dd1fb4ade9bcce34adeece3db078a32 /fastboot/usb_osx.cpp
parent98a6db5c9bb6497c5f9a71570a39659c366342b9 (diff)
parent35c1a6203e0300cf4097e4506f6cd0d40dc80e58 (diff)
downloadsystem_core-c8cad2cbfc4cf04b04e6db22651719fb1140074a.tar.gz
system_core-c8cad2cbfc4cf04b04e6db22651719fb1140074a.tar.bz2
system_core-c8cad2cbfc4cf04b04e6db22651719fb1140074a.zip
Merge "Revert "Get fastboot working on OS X""
Diffstat (limited to 'fastboot/usb_osx.cpp')
-rw-r--r--fastboot/usb_osx.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp
index 032ae3187..9069baa69 100644
--- a/fastboot/usb_osx.cpp
+++ b/fastboot/usb_osx.cpp
@@ -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);
}