commit 1b9a7613278bf6de1df61c9735bec42c5d735a86
author Elliott Hughes <enh@google.com> Fri Feb 03 18:48:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 03 18:48:07 2017 +0000
tree c4dbcf7d4375a33c6a97c72ae62bdbb5be32d638
parent 656b8e60e17bde2e2a3e27caa269663aaff6cecc
parent f2673de74da6d9b20bdb41732661ab6e0cadb4f5

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

Change-Id: I3719f866d364c3030536dd1590a1d0e6c777eff5

fastboot/usb_osx.cpp

diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp
index 032ae31..9069baa 100644
--- a/fastboot/usb_osx.cpp
+++ b/fastboot/usb_osx.cpp
@@ -302,13 +302,6 @@
 
     // 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 @@
         goto error;
     }
 
-    out:
-
-    (*dev)->USBDeviceClose(dev);
     (*dev)->Release(dev);
     return 0;
 
     error:
 
     if (dev != NULL) {
-        (*dev)->USBDeviceClose(dev);
         (*dev)->Release(dev);
     }