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

Commit dc25b78f authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: fix quirk handling in usbmouse/kbd 



When usbmouse/kbd is set to build, USB_HID is never defined due to
the USB_HID!=y Kconfig rule. Test CONFIG_USB_HID_MODULE in both
drivers instead.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 4db1c62c

drivers/hid/usbhid/usbkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int usb_kbd_probe(struct usb_interface *iface, 
	if (!usb_endpoint_is_int_in(endpoint))

		return -ENODEV;



#ifdef CONFIG_USB_HID

#ifdef CONFIG_USB_HID_MODULE

	if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),

				le16_to_cpu(dev->descriptor.idProduct))

			& HID_QUIRK_IGNORE) {

drivers/hid/usbhid/usbmouse.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 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

#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)) {