From 6b4e5e5d0899749c34b92cd687380e81f4bbdc86 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 17 Dec 2007 16:11:27 +0100 Subject: [PATCH] --- yaml --- r: 77659 b: refs/heads/master c: b0e668240949f69e84d69f998aa9af759e8be635 h: refs/heads/master i: 77657: 99a5590999799a8d01a185dc3664ff8c58d196fe 77655: ba32fdbeb271ae71885cc727fb1530dca444cfde v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/usbkbd.c | 2 ++ trunk/drivers/hid/usbhid/usbmouse.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c8b7dd246342..a1d139fe1d4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15b55fb879e901bbc0da05054b14ccbc2752a56a +refs/heads/master: b0e668240949f69e84d69f998aa9af759e8be635 diff --git a/trunk/drivers/hid/usbhid/usbkbd.c b/trunk/drivers/hid/usbhid/usbkbd.c index a31ccb4fca09..5d9dbb47e4a8 100644 --- a/trunk/drivers/hid/usbhid/usbkbd.c +++ b/trunk/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/trunk/drivers/hid/usbhid/usbmouse.c b/trunk/drivers/hid/usbhid/usbmouse.c index 8ff1b3fe8d6d..df0d96d989de 100644 --- a/trunk/drivers/hid/usbhid/usbmouse.c +++ b/trunk/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));