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

Commit 86b84167 authored Oct 18, 2013 by David Herrmann Committed by Jiri Kosina Oct 21, 2013

HID: wiimote: add LEGO-wiimote VID



The LEGO-wiimote uses a different VID than the Nintendo ID. The device is
technically the same so add the ID.

Cc: <stable@vger.kernel.org> # 3.11+
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent ad0e669b

drivers/hid/hid-core.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1871,6 +1871,7 @@ static const struct hid_device_id hid_have_special_driver[] = {

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
			{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
	{ }		{ }
	};		};

drivers/hid/hid-ids.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -633,6 +633,7 @@
	#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003		#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003

	#define USB_VENDOR_ID_NINTENDO 0x057e		#define USB_VENDOR_ID_NINTENDO 0x057e
			#define USB_VENDOR_ID_NINTENDO2 0x054c
	#define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306		#define USB_DEVICE_ID_NINTENDO_WIIMOTE 0x0306
	#define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330		#define USB_DEVICE_ID_NINTENDO_WIIMOTE2 0x0330

drivers/hid/hid-wiimote-core.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -834,7 +834,8 @@ static void wiimote_init_set_type(struct wiimote_data *wdata,
	goto done;		goto done;
	}		}

	if (vendor == USB_VENDOR_ID_NINTENDO) {		if (vendor == USB_VENDOR_ID_NINTENDO \|\|
			vendor == USB_VENDOR_ID_NINTENDO2) {
	if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) {		if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) {
	devtype = WIIMOTE_DEV_GEN10;		devtype = WIIMOTE_DEV_GEN10;
	goto done;		goto done;
	@@ -1855,6 +1856,8 @@ static void wiimote_hid_remove(struct hid_device *hdev)
	static const struct hid_device_id wiimote_hid_devices[] = {		static const struct hid_device_id wiimote_hid_devices[] = {
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
	USB_DEVICE_ID_NINTENDO_WIIMOTE) },		USB_DEVICE_ID_NINTENDO_WIIMOTE) },
			{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO2,
			USB_DEVICE_ID_NINTENDO_WIIMOTE) },
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
	USB_DEVICE_ID_NINTENDO_WIIMOTE2) },		USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
	{ }		{ }