瀏覽代碼

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>
Paul Walmsley 18 年之前
父節點
當前提交
4cbe7d28f2
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      drivers/hid/usbhid/hid-core.c

+ 3 - 2
drivers/hid/usbhid/hid-core.c

@@ -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)
 	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;