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

Commit 7c9800df authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" am: b721c97e am:... 

Merge "usb-bulk-transfer: Clarify sign-iy-ness of param" am: b721c97e am: 775a97fa am: 6d83246d
am: f4e1e0ff

Change-Id: Ifa9603f1e667fde9c1f1920f9b5515bcd6051341
parents 629494b3 f4e1e0ff

libusbhost/include/usbhost/usbhost.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int usb_device_control_transfer(struct usb_device *device, 
int usb_device_bulk_transfer(struct usb_device *device,

                            int endpoint,

                            void* buffer,

                            int length,

                            unsigned int length,

                            unsigned int timeout);



/** Reset USB bus for the device */

libusbhost/usbhost.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ int usb_device_control_transfer(struct usb_device *device, 
int usb_device_bulk_transfer(struct usb_device *device,

                            int endpoint,

                            void* buffer,

                            int length,

                            unsigned int length,

                            unsigned int timeout)

{

    struct usbdevfs_bulktransfer  ctrl;