瀏覽代碼

HID: fix compilation of hidbp drivers without usbhid

We can use the blacklist only if usbhid code is compiled.

Reported-by: jurriaan <thunder7@xs4all.nl>
Cc: Pascal Terjan <pterjan@mandriva.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Jiri Kosina 17 年之前
父節點
當前提交
b0e6682409
共有 2 個文件被更改,包括 4 次插入0 次删除
  1. 2 0
      drivers/hid/usbhid/usbkbd.c
  2. 2 0
      drivers/hid/usbhid/usbmouse.c

+ 2 - 0
drivers/hid/usbhid/usbkbd.c

@@ -235,11 +235,13 @@ static int usb_kbd_probe(struct usb_interface *iface,
 	if (!usb_endpoint_is_int_in(endpoint))
 	if (!usb_endpoint_is_int_in(endpoint))
 		return -ENODEV;
 		return -ENODEV;
 
 
+#ifdef CONFIG_USB_HID
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 				le16_to_cpu(dev->descriptor.idProduct))
 				le16_to_cpu(dev->descriptor.idProduct))
 			& HID_QUIRK_IGNORE) {
 			& HID_QUIRK_IGNORE) {
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}
+#endif
 
 
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));

+ 2 - 0
drivers/hid/usbhid/usbmouse.c

@@ -131,11 +131,13 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
 	if (!usb_endpoint_is_int_in(endpoint))
 	if (!usb_endpoint_is_int_in(endpoint))
 		return -ENODEV;
 		return -ENODEV;
 
 
+#ifdef CONFIG_USB_HID
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
 				le16_to_cpu(dev->descriptor.idProduct))
 				le16_to_cpu(dev->descriptor.idProduct))
 			& (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
 			& (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}
+#endif
 
 
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
 	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));