openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 6ee7ff42: Merge "libusbhost: Fix problem reading USB string descriptors on some quirky devices" into mnc-dev 

* commit '6ee7ff426893d8b8ebbb63e02073b9780912bd17':
  libusbhost: Fix problem reading USB string descriptors on some quirky devices
This commit is contained in:
Mike Lockwood 2015-06-19 13:56:31 +00:00 committed by Android Git Automerger
parent 7cba866569 6ee7ff4268
commit 0882d3a1d4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libusbhost/usbhost.c
View File

@ -56,6 +56,9 @@
#define USB_FS_ID_SCANNER USB_FS_DIR "/%d/%d"
#define USB_FS_ID_FORMAT USB_FS_DIR "/%03d/%03d"
// 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
@ -449,8 +452,8 @@ const struct usb_device_descriptor* usb_device_get_device_descriptor(struct usb_
char* usb_device_get_string(struct usb_device *device, int id)
{
char string[256];
__u16 buffer[128];
__u16 languages[128];
__u16 buffer[MAX_STRING_DESCRIPTOR_LENGTH / sizeof(__u16)];
__u16 languages[MAX_STRING_DESCRIPTOR_LENGTH / sizeof(__u16)];
int i, result;
int languageCount = 0;