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

Commit f41ee3d5 authored by Esteban de la Canal's avatar Esteban de la Canal Committed by Gerrit Code Review
Browse files

Merge "74602: Fixes adb not seeing connected devices on Mac."

parents e18ed89e 9dd83dc9

adb/usb_osx.c

+9 −5
Original line number Diff line number Diff line
@@ -513,14 +513,18 @@ int usb_read(usb_handle *handle, void *buf, int len) 
        return -1;

    }



    result =

      (*handle->interface)->ReadPipe(handle->interface,

                                    handle->bulkIn, buf, &numBytes);

    result = (*handle->interface)->ReadPipe(handle->interface, handle->bulkIn, buf, &numBytes);



    if (0 == result)

    if (kIOUSBPipeStalled == result) {

        DBG(" Pipe stalled, clearing stall.\n");

        (*handle->interface)->ClearPipeStall(handle->interface, handle->bulkIn);

        result = (*handle->interface)->ReadPipe(handle->interface, handle->bulkIn, buf, &numBytes);

    }



    if (kIOReturnSuccess == result)

        return 0;

    else {

        DBG("ERR: usb_read failed with status %d\n", result);

        DBG("ERR: usb_read failed with status %x\n", result);

    }



    return -1;