Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6b3727 authored by Pascal Terjan's avatar Pascal Terjan Committed by Jiri Kosina
Browse files

HID: Use hid blacklist in usbmouse/usbkbd 



This fixes wacom tablets not working if usbmouse is loaded.

Signed-off-by: default avatarPascal Terjan <pterjan@mandriva.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 628edcde

drivers/hid/usbhid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -911,6 +911,8 @@ u32 usbhid_lookup_quirk(const u16 idVendor, const u16 idProduct) 
	return quirks;

}



EXPORT_SYMBOL_GPL(usbhid_lookup_quirk);



/*

 * Cherry Cymotion keyboard have an invalid HID report descriptor,

 * that needs fixing before we can parse it.

drivers/hid/usbhid/usbkbd.c

+6 −0
Original line number Diff line number Diff line
@@ -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));

drivers/hid/usbhid/usbmouse.c

+6 −0
Original line number Diff line number Diff line
@@ -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));