aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
diff options
context:
space:
mode:
authorPaul Walmsley <paul@booyaka.com>2007-03-20 14:23:16 -0400
committerJiri Kosina <jkosina@suse.cz>2007-04-11 04:36:02 -0400
commit4cbe7d28f2c63e801d651b3b56f953a5ff5ae70f (patch)
tree2d7f0b206462bade78d0775663a44c1a91129148 /drivers/hid/usbhid
parent5e2a55f25d255a356bdaf2cb04c71b8d76c307a8 (diff)
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: Paul Walmsley <paul@booyaka.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r--drivers/hid/usbhid/hid-core.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 35a41e60f541..5e430813d4d4 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -287,7 +287,7 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice");
287static const struct hid_blacklist { 287static const struct hid_blacklist {
288 __u16 idVendor; 288 __u16 idVendor;
289 __u16 idProduct; 289 __u16 idProduct;
290 unsigned quirks; 290 __u32 quirks;
291} hid_blacklist[] = { 291} hid_blacklist[] = {
292 292
293 { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, 293 { 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 struct usb_device *dev = interface_to_usbdev (intf); 1063 struct usb_device *dev = interface_to_usbdev (intf);
1064 struct hid_descriptor *hdesc; 1064 struct hid_descriptor *hdesc;
1065 struct hid_device *hid; 1065 struct hid_device *hid;
1066 unsigned quirks = 0, rsize = 0; 1066 __u32 quirks = 0;
1067 unsigned rsize = 0;
1067 char *rdesc; 1068 char *rdesc;
1068 int n, len, insize = 0; 1069 int n, len, insize = 0;
1069 struct usbhid_device *usbhid; 1070 struct usbhid_device *usbhid;