Commit 578f3a35 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: add USB ID for another dual gameron adapter 



0x0810/0x0002 needs the very same handling as 0x0001.

Reported-by: default avatarSteve Conklin <sconklin@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 06d2148e

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ 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) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 


#define USB_VENDOR_ID_GAMERON		0x0810

#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001

#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002



#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

drivers/hid/hid-pl.c

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id) 
static const struct hid_device_id pl_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),

		.driver_data = 1 }, /* Twin USB Joystick */

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR),

		.driver_data = 1 }, /* Twin USB Joystick */

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */

	{ }

};