lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usbhid endianness annotations and fixes

Browse Source 
usb_control_msg() converts arguments to little-endian itself,
doing that in caller means breakage on big-endian boxen.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2008-04-28 07:00:05 +01:00
committed by Linus Torvalds
parent d28aa3ac4c
commit 01d7b36988
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hid/usbhid/hid-core.c
View File

@ -654,7 +654,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
HID_REQ_SET_REPORT, HID_REQ_SET_REPORT,
USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE, USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
cpu_to_le16(((HID_OUTPUT_REPORT + 1) << 8) | *buf), ((HID_OUTPUT_REPORT + 1) << 8) | *buf,
interface->desc.bInterfaceNumber, buf + 1, count - 1, interface->desc.bInterfaceNumber, buf + 1, count - 1,
USB_CTRL_SET_TIMEOUT); USB_CTRL_SET_TIMEOUT);

4
include/linux/hid.h
View File

@ -498,13 +498,13 @@ struct hid_parser {
struct hid_class_descriptor { struct hid_class_descriptor {
__u8 bDescriptorType; __u8 bDescriptorType;
__u16 wDescriptorLength; __le16 wDescriptorLength;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct hid_descriptor { struct hid_descriptor {
__u8 bLength; __u8 bLength;
__u8 bDescriptorType; __u8 bDescriptorType;
__u16 bcdHID; __le16 bcdHID;
__u8 bCountryCode; __u8 bCountryCode;
__u8 bNumDescriptors; __u8 bNumDescriptors;