Commit 6b8588f7 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

usb input endianness annotations and fixes

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24caa6a0
...@@ -159,7 +159,7 @@ static int iforce_usb_probe(struct usb_interface *intf, ...@@ -159,7 +159,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE; iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;
iforce->cr.wIndex = 0; iforce->cr.wIndex = 0;
iforce->cr.wLength = 16; iforce->cr.wLength = cpu_to_le16(16);
usb_fill_int_urb(iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress), usb_fill_int_urb(iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress),
iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval); iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval);
......
...@@ -897,7 +897,7 @@ static int gtco_probe(struct usb_interface *usbinterface, ...@@ -897,7 +897,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
dbg("Extra descriptor success: type:%d len:%d", dbg("Extra descriptor success: type:%d len:%d",
hid_desc->bDescriptorType, hid_desc->wDescriptorLength); hid_desc->bDescriptorType, hid_desc->wDescriptorLength);
report = kzalloc(hid_desc->wDescriptorLength, GFP_KERNEL); report = kzalloc(le16_to_cpu(hid_desc->wDescriptorLength), GFP_KERNEL);
if (!report) { if (!report) {
err("No more memory for report"); err("No more memory for report");
error = -ENOMEM; error = -ENOMEM;
...@@ -913,16 +913,16 @@ static int gtco_probe(struct usb_interface *usbinterface, ...@@ -913,16 +913,16 @@ static int gtco_probe(struct usb_interface *usbinterface,
REPORT_DEVICE_TYPE << 8, REPORT_DEVICE_TYPE << 8,
0, /* interface */ 0, /* interface */
report, report,
hid_desc->wDescriptorLength, le16_to_cpu(hid_desc->wDescriptorLength),
5000); /* 5 secs */ 5000); /* 5 secs */
if (result == hid_desc->wDescriptorLength) if (result == le16_to_cpu(hid_desc->wDescriptorLength))
break; break;
} }
/* If we didn't get the report, fail */ /* If we didn't get the report, fail */
dbg("usb_control_msg result: :%d", result); dbg("usb_control_msg result: :%d", result);
if (result != hid_desc->wDescriptorLength) { if (result != le16_to_cpu(hid_desc->wDescriptorLength)) {
err("Failed to get HID Report Descriptor of size: %d", err("Failed to get HID Report Descriptor of size: %d",
hid_desc->wDescriptorLength); hid_desc->wDescriptorLength);
error = -EIO; error = -EIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment