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/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index f8ad6910d3d9..8ff1b3fe8d6d 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -131,6 +131,12 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
         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|HID_QUIRK_IGNORE_MOUSE)) {
+                return -ENODEV;
+        }
+
         pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
         maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));