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

Commit fa157bdf authored by Alan Stern's avatar Alan Stern Committed by Jiri Kosina
Browse files

HID: add quirk entry for no-name keyboard (0x13ba/0x0017) 



This patch (as1157) adds a no-name PS/2-to-USB keyboard+mouse adapter
to the hid-dell driver.  (The device shows up with a Product string
saying "Generic USB K/B", nothing more.)  This will force an initial
"Set-LEDs" report to be sent to the device, without which it won't
send any keystroke information.  Several bug reports mentioning this
device have been filed in various forums; the patch should resolve
them.

This is just a temporary stop-gap for 2.6.28.  A later patch for
2.6.29 will introduce a more generic mechanism for "Set-LEDs", making
this change (and the entire hid-dell driver) unnecessary.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 8175fe2d

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1263,6 +1263,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

drivers/hid/hid-dell.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ err_free: 
static const struct hid_device_id dell_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },

	{ }

};

MODULE_DEVICE_TABLE(hid, dell_devices);

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ 


#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc



#define USB_VENDOR_ID_GENERIC_13BA	0x13ba

#define USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE	0x0017



#define USB_VENDOR_ID_GLAB		0x06c2

#define USB_DEVICE_ID_4_PHIDGETSERVO_30	0x0038

#define USB_DEVICE_ID_1_PHIDGETSERVO_30	0x0039