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

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

Merge "fastboot: Workaround for touchbar hang on MBP 2016" am: fc267f86 am: 0474cfba 

am: 7c5cb5c6

Change-Id: I08047934e1e35c294a24689078db5235c2e596d5
parents e189d546 7c5cb5c6

fastboot/usb_osx.cpp

+0 −8
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
    HRESULT result;

    SInt32 score;

    UInt8 interfaceNumEndpoints;

    UInt8 configuration;



    // Placing the constant KIOUSBFindInterfaceDontCare into the following

    // fields of the IOUSBFindInterfaceRequest structure will allow us to
@@ -102,13 +101,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
    request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare;

    request.bAlternateSetting = kIOUSBFindInterfaceDontCare;



    // SetConfiguration will kill an existing UMS connection, so let's

    // not do this if not necessary.

    configuration = 0;

    (*dev)->GetConfiguration(dev, &configuration);

    if (configuration != 1)

        (*dev)->SetConfiguration(dev, 1);



    // Get an iterator for the interfaces on the device

    kr = (*dev)->CreateInterfaceIterator(dev, &request, &iterator);