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

Commit aad932e7 authored by Andres Freund's avatar Andres Freund Committed by Jiri Kosina
Browse files

HID: tpkbd: work even if the new Lenovo Keyboard driver is not configured 



c1dcad2d added a new driver configured by
HID_LENOVO_TPKBD but made the hid_have_special_driver entry non-optional which
lead to a recognized but non-working device if the new driver wasn't
configured (which is the correct default).

Signed-off-by: default avatarAndres Freund <andres@anarazel.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9bfc8da0

drivers/hid/hid-core.c

+3 −1
Original line number Diff line number Diff line
@@ -1559,7 +1559,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },

#if IS_ENABLED(CONFIG_HID_LENOVO_TPKBD)

	{ HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPKBD) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },