Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce8eb8a7 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

am: eaaca580

Change-Id: I3719f866d364c3030536dd1590a1d0e6c777eff5
parents b74b5571 eaaca580

fastboot/usb_osx.cpp

+0 −11
Original line number Diff line number Diff line
@@ -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);

    }