HID: fix compilation of hidbp drivers without usbhid
Jiri Kosina [Mon, 17 Dec 2007 15:11:27 +0000 (16:11 +0100)]
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>

drivers/hid/usbhid/usbkbd.c
drivers/hid/usbhid/usbmouse.c

index a31ccb4..5d9dbb4 100644 (file)
@@ -235,11 +235,13 @@ static int usb_kbd_probe(struct usb_interface *iface,
        if (!usb_endpoint_is_int_in(endpoint))
                return -ENODEV;
 
+#ifdef CONFIG_USB_HID
        if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
                                le16_to_cpu(dev->descriptor.idProduct))
                        & HID_QUIRK_IGNORE) {
                return -ENODEV;
        }
+#endif
 
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
index 8ff1b3f..df0d96d 100644 (file)
@@ -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))
                return -ENODEV;
 
+#ifdef CONFIG_USB_HID
        if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
                                le16_to_cpu(dev->descriptor.idProduct))
                        & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
                return -ENODEV;
        }
+#endif
 
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));