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

Commit 9316e580 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Revert "HID: wiimote: add LEGO-wiimote VID" 



This reverts commit 86b84167 as it introduced a
VID/PID conflict with its original owner: hid-wiimote got
hid:b0005g*v0000054Cp00000306 added but hid-sony already has this id for the
PS3 Remote (and the ID is oficically assigned to Sony).

Revert the commit to avoid hid-sony regression. David is working on a
bluez patch to force proper ID on the wiimote.

Reported-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reported-by: default avatarMichel Kraus <mksolpa@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 9f323b68

drivers/hid/hid-core.c

+0 −1
Original line number Diff line number Diff line
@@ -1879,7 +1879,6 @@ 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_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) },

	{ }

};

drivers/hid/hid-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -640,7 +640,6 @@ 
#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN	0x0003



#define USB_VENDOR_ID_NINTENDO		0x057e

#define USB_VENDOR_ID_NINTENDO2		0x054c

#define USB_DEVICE_ID_NINTENDO_WIIMOTE	0x0306

#define USB_DEVICE_ID_NINTENDO_WIIMOTE2	0x0330

drivers/hid/hid-wiimote-core.c

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

	}



	if (vendor == USB_VENDOR_ID_NINTENDO ||

	    vendor == USB_VENDOR_ID_NINTENDO2) {

	if (vendor == USB_VENDOR_ID_NINTENDO) {

		if (product == USB_DEVICE_ID_NINTENDO_WIIMOTE) {

			devtype = WIIMOTE_DEV_GEN10;

			goto done;
@@ -1856,8 +1855,6 @@ static void wiimote_hid_remove(struct hid_device *hdev) 
static const struct hid_device_id wiimote_hid_devices[] = {

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

	{ }