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

Commit c672cb07 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Include the error code if GetPipeProperties fails."

parents ff52e23f 6e02c24c

adb/usb_osx.cpp

+5 −1
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ 


#define  DBG   D



// There's no strerror equivalent for the errors returned by IOKit.

// https://developer.apple.com/library/mac/documentation/DeviceDrivers/Conceptual/AccessingHardware/AH_Handling_Errors/AH_Handling_Errors.html

// Search the web for "IOReturn.h" to find a complete up to date list.



static IONotificationPortRef    notificationPort = 0;

static io_iterator_t            notificationIterator;
@@ -362,7 +366,7 @@ CheckInterface(IOUSBInterfaceInterface **interface, UInt16 vendor, UInt16 produc 


            handle->zero_mask = maxPacketSize - 1;

        } else {

            DBG("ERR: FindDeviceInterface - could not get pipe properties\n");

            DBG("ERR: FindDeviceInterface - could not get pipe properties (%08x)\n", kr);

            goto err_get_pipe_props;

        }

    }

fastboot/usb_osx.cpp

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { 
                    handle->zero_mask = maxPacketSize - 1;

                }

            } else {

                ERR("could not get pipe properties\n");

                ERR("could not get pipe properties (%08x)\n", kr);

            }



            if (handle->info.has_bulk_in && handle->info.has_bulk_out) {