From b0e668240949f69e84d69f998aa9af759e8be635 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 17 Dec 2007 16:11:27 +0100 Subject: [PATCH] HID: fix compilation of hidbp drivers without usbhid We can use the blacklist only if usbhid code is compiled. Reported-by: jurriaan Cc: Pascal Terjan Signed-off-by: Jiri Kosina --- drivers/hid/usbhid/usbkbd.c | 2 ++ drivers/hid/usbhid/usbmouse.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c index a31ccb4fca..5d9dbb47e4 100644 --- a/drivers/hid/usbhid/usbkbd.c +++ b/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)) 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)); diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index 8ff1b3fe8d..df0d96d989 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/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)) 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)); -- 2.39.5