Commit 4cbe7d28 authored by Paul Walmsley's avatar Paul Walmsley Committed by Jiri Kosina

USB HID: specify explicit size for hid_blacklist.quirks

Explicitly specify the size of the hid_blacklist quirks member, to guard
against surprises on architectures where unsigned ints aren't 32 bits long.
Signed-off-by: default avatarPaul Walmsley <paul@booyaka.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 5e2a55f2
...@@ -287,7 +287,7 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); ...@@ -287,7 +287,7 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
static const struct hid_blacklist { static const struct hid_blacklist {
__u16 idVendor; __u16 idVendor;
__u16 idProduct; __u16 idProduct;
unsigned quirks; __u32 quirks;
} hid_blacklist[] = { } hid_blacklist[] = {
{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },
...@@ -1063,7 +1063,8 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) ...@@ -1063,7 +1063,8 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
struct usb_device *dev = interface_to_usbdev (intf); struct usb_device *dev = interface_to_usbdev (intf);
struct hid_descriptor *hdesc; struct hid_descriptor *hdesc;
struct hid_device *hid; struct hid_device *hid;
unsigned quirks = 0, rsize = 0; __u32 quirks = 0;
unsigned rsize = 0;
char *rdesc; char *rdesc;
int n, len, insize = 0; int n, len, insize = 0;
struct usbhid_device *usbhid; struct usbhid_device *usbhid;
......
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