From 7625db5a38419c0d372f3a6d660631915d5d5db9 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Mon, 21 Jul 2008 18:30:05 +0200 Subject: [PATCH] --- yaml --- r: 104983 b: refs/heads/master c: acc0b7c40983c316bc69d97b1acf05a228b0d61e h: refs/heads/master i: 104981: 71ed5324d40396d530d96c0a4d3d472a6da2158c 104979: 6b1c10af0e008a378c698cc02870f2fdde7dbf08 104975: b54fef6644d1ff9f18ccaefbaca1a1de0699cf86 v: v3 --- [refs] | 2 +- trunk/drivers/hid/usbhid/usbkbd.c | 8 -------- trunk/drivers/hid/usbhid/usbmouse.c | 8 -------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/[refs] b/[refs] index dcc80c51f3be..c04fb5b7bc96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 094403ce3ec30e9819b1526134a948a1c92d1421 +refs/heads/master: acc0b7c40983c316bc69d97b1acf05a228b0d61e diff --git a/trunk/drivers/hid/usbhid/usbkbd.c b/trunk/drivers/hid/usbhid/usbkbd.c index d7212ac89233..0caaafe01843 100644 --- a/trunk/drivers/hid/usbhid/usbkbd.c +++ b/trunk/drivers/hid/usbhid/usbkbd.c @@ -233,14 +233,6 @@ static int usb_kbd_probe(struct usb_interface *iface, if (!usb_endpoint_is_int_in(endpoint)) return -ENODEV; -#ifdef CONFIG_USB_HID_MODULE - 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 f74740f92808..35689ef172cc 100644 --- a/trunk/drivers/hid/usbhid/usbmouse.c +++ b/trunk/drivers/hid/usbhid/usbmouse.c @@ -129,14 +129,6 @@ 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_MODULE - 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));