HID: Use hid blacklist in usbmouse/usbkbd

This fixes wacom tablets not working if usbmouse is loaded.

Signed-off-by: Pascal Terjan <pterjan@mandriva.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 775a1ef28a29..a31ccb4fca09 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -235,6 +235,12 @@ static int usb_kbd_probe(struct usb_interface *iface,
         if (!usb_endpoint_is_int_in(endpoint))
                 return -ENODEV;
 
+        if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
+                                le16_to_cpu(dev->descriptor.idProduct))
+                        & HID_QUIRK_IGNORE) {
+                return -ENODEV;
+        }
+
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));