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

Commit d7f5b6de authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Signature of usb_request_wait changed"

parents 306162c7 cb8d8af1

media/mtp/MtpDataPacket.cpp

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ int MtpDataPacket::readDataAsync(struct usb_request *req) { 


// Wait for result of readDataAsync

int MtpDataPacket::readDataWait(struct usb_device *device) {

    struct usb_request *req = usb_request_wait(device);

    struct usb_request *req = usb_request_wait(device, -1);

    return (req ? req->actual_length : -1);

}

media/mtp/MtpEventPacket.cpp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ int MtpEventPacket::sendRequest(struct usb_request *request) { 
}



int MtpEventPacket::readResponse(struct usb_device *device) {

    struct usb_request* const req = usb_request_wait(device);

    struct usb_request* const req = usb_request_wait(device, -1);

    if (req) {

        mPacketSize = req->actual_length;

        return req->actual_length;