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

Commit b0e66824 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: fix compilation of hidbp drivers without usbhid 



We can use the blacklist only if usbhid code is compiled.

Reported-by: default avatarjurriaan <thunder7@xs4all.nl>
Cc: Pascal Terjan <pterjan@mandriva.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 15b55fb8

drivers/hid/usbhid/usbkbd.c

+2 −0
Original line number Diff line number Diff line
@@ -235,11 +235,13 @@ static int usb_kbd_probe(struct usb_interface *iface, 
	if (!usb_endpoint_is_int_in(endpoint))

		return -ENODEV;



#ifdef CONFIG_USB_HID

	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));

drivers/hid/usbhid/usbmouse.c

+2 −0
Original line number Diff line number Diff line
@@ -131,11 +131,13 @@ 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

	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));