Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

HID: fix quirk handling in usbmouse/kbd

When usbmouse/kbd is set to build, USB_HID is never defined due to
the USB_HID!=y Kconfig rule. Test CONFIG_USB_HID_MODULE in both
drivers instead.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Jiri Slaby 17 years ago
parent
4db1c62c99
commit
dc25b78f21
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/hid/usbhid/usbkbd.c
  2. 1 1
      drivers/hid/usbhid/usbmouse.c

+ 1 - 1
drivers/hid/usbhid/usbkbd.c
View File 

@@ -233,7 +233,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
 
 	if (!usb_endpoint_is_int_in(endpoint))
 
 		return -ENODEV;
 
 
-#ifdef CONFIG_USB_HID
 
+#ifdef CONFIG_USB_HID_MODULE
 
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 
 				le16_to_cpu(dev->descriptor.idProduct))
 
 			& HID_QUIRK_IGNORE) {

+ 1 - 1
drivers/hid/usbhid/usbmouse.c
View File 

@@ -129,7 +129,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
 
 	if (!usb_endpoint_is_int_in(endpoint))
 
 		return -ENODEV;
 
 
-#ifdef CONFIG_USB_HID
 
+#ifdef CONFIG_USB_HID_MODULE
 
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 
 				le16_to_cpu(dev->descriptor.idProduct))
 
 			& (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {