From 4cbe7d28f2c63e801d651b3b56f953a5ff5ae70f Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Tue, 20 Mar 2007 19:23:16 +0100 Subject: 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 Signed-off-by: Jiri Kosina --- drivers/hid/usbhid/hid-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/hid') 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"); static const struct hid_blacklist { __u16 idVendor; __u16 idProduct; - unsigned quirks; + __u32 quirks; } hid_blacklist[] = { { 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) struct usb_device *dev = interface_to_usbdev (intf); struct hid_descriptor *hdesc; struct hid_device *hid; - unsigned quirks = 0, rsize = 0; + __u32 quirks = 0; + unsigned rsize = 0; char *rdesc; int n, len, insize = 0; struct usbhid_device *usbhid; -- cgit v1.2.3