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

Commit 7163045f authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Remove urb request size maximum." am: 1cb765c8 am: 1ab6e9d0 

am: a306a3b1

Change-Id: I635cb3547e72e0c6a8084d7b3ff2c9cbae1b2525
parents 2502e43b a306a3b1

libusbhost/usbhost.c

+1 −13
Original line number Diff line number Diff line
@@ -64,10 +64,6 @@ 
// Some devices fail to send string descriptors if we attempt reading > 255 bytes

#define MAX_STRING_DESCRIPTOR_LENGTH    255



// From drivers/usb/core/devio.c

// I don't know why this isn't in a kernel header

#define MAX_USBFS_BUFFER_SIZE   16384



#define MAX_USBFS_WD_COUNT      10



struct usb_host_context {
@@ -675,10 +671,6 @@ int usb_device_bulk_transfer(struct usb_device *device, 
{

    struct usbdevfs_bulktransfer  ctrl;



    // need to limit request size to avoid EINVAL

    if (length > MAX_USBFS_BUFFER_SIZE)

        length = MAX_USBFS_BUFFER_SIZE;



    memset(&ctrl, 0, sizeof(ctrl));

    ctrl.ep = endpoint;

    ctrl.len = length;
@@ -738,10 +730,6 @@ int usb_request_queue(struct usb_request *req) 


    urb->status = -1;

    urb->buffer = req->buffer;

    // need to limit request size to avoid EINVAL

    if (req->buffer_length > MAX_USBFS_BUFFER_SIZE)

        urb->buffer_length = MAX_USBFS_BUFFER_SIZE;

    else

    urb->buffer_length = req->buffer_length;



    do {