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

Commit 633a7ecf authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

[PATCH] usbhid: Remove unneeded blacklist entries 



Now that usbhid automatically applies HID_QUIRK_NOGET to keyboards and
mice, we no longer need the blacklist entries that were present for no
other purpose.  This patch (as698) removes them.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3f8f4a18

drivers/usb/input/hid-core.c

+0 −28
Original line number Diff line number Diff line
@@ -1374,9 +1374,6 @@ void hid_close(struct hid_device *hid) 


#define USB_VENDOR_ID_PANJIT		0x134c



#define USB_VENDOR_ID_SILVERCREST	0x062a

#define USB_DEVICE_ID_SILVERCREST_KB	0x0201



/*

 * Initialize all reports

 */
@@ -1461,9 +1458,6 @@ void hid_init_reports(struct hid_device *hid) 
#define USB_VENDOR_ID_ONTRAK		0x0a07

#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064



#define USB_VENDOR_ID_TANGTOP		0x0d3d

#define USB_DEVICE_ID_TANGTOP_USBPS2	0x0001



#define USB_VENDOR_ID_ESSENTIAL_REALITY	0x0d7f

#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100
@@ -1520,12 +1514,6 @@ void hid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_MCC_PMD1024LS	0x0076

#define USB_DEVICE_ID_MCC_PMD1208LS	0x007a



#define USB_VENDOR_ID_CHICONY		0x04f2

#define USB_DEVICE_ID_CHICONY_USBHUB_KB	0x0100



#define USB_VENDOR_ID_BTC		0x046e

#define USB_DEVICE_ID_BTC_KEYBOARD	0x5303



#define USB_VENDOR_ID_VERNIER		0x08f7

#define USB_DEVICE_ID_VERNIER_LABPRO	0x0001

#define USB_DEVICE_ID_VERNIER_GOTEMP	0x0002
@@ -1554,15 +1542,6 @@ void hid_init_reports(struct hid_device *hid) 
#define USB_VENDOR_ID_CHERRY		0x046a

#define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023



#define USB_VENDOR_ID_HP		0x03f0

#define USB_DEVICE_ID_HP_USBHUB_KB	0x020c



#define USB_VENDOR_ID_IBM		0x04b3

#define USB_DEVICE_ID_IBM_USBHUB_KB	0x3005



#define USB_VENDOR_ID_CREATIVELABS	0x062a

#define USB_DEVICE_ID_CREATIVELABS_SILVERCREST	0x0201



#define USB_VENDOR_ID_YEALINK		0x6993

#define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K	0xb001

/*
@@ -1683,14 +1662,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_KEYBOARD, HID_QUIRK_NOGET},

	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},

	{ USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_USBHUB_KB, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },

	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET },



	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL },

	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },