Commit a9d9e46c authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

Revert "HID: logitech-hidpp: Enable HID++ for all the Logitech Bluetooth devices" 

This reverts commit 532223c8.

As reported in [0], hid-logitech-hidpp now binds on all bluetooth mice,
but there are corner cases where hid-logitech-hidpp just gives up on
the mouse. This leads the end user with a dead mouse.

Given that we are at -rc8, we are definitively too late to find a proper
fix. We already identified 2 issues less than 24 hours after the bug
report. One in that ->match() was never designed to be used anywhere else
than in hid-generic, and the other that hid-logitech-hidpp has corner
cases where it gives up on devices it is not supposed to.

So we have no choice but postpone this patch to the next kernel release.

[0] https://lore.kernel.org/linux-input/CAJZ5v0g-_o4AqMgNwihCb0jrwrcJZfRrX=jv8aH54WNKO7QB8A@mail.gmail.com/



Reported-by: default avatarRafael J . Wysocki <rjw@rjwysocki.net>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 40f2432b

drivers/hid/hid-logitech-hidpp.c

+0 −19
Original line number Diff line number Diff line
@@ -4269,21 +4269,6 @@ static void hidpp_remove(struct hid_device *hdev) 
	mutex_destroy(&hidpp->send_mutex);

}



static const struct hid_device_id unhandled_hidpp_devices[] = {

	/* Logitech Harmony Adapter for PS3, handled in hid-sony */

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3) },

	/* Handled in hid-generic */

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DINOVO_EDGE_KBD) },

	{}

};



static bool hidpp_match(struct hid_device *hdev,

			bool ignore_special_driver)

{

	/* Refuse to handle devices handled by other HID drivers */

	return !hid_match_id(hdev, unhandled_hidpp_devices);

}



#define LDJ_DEVICE(product) \

	HID_DEVICE(BUS_USB, HID_GROUP_LOGITECH_DJ_DEVICE, \

		   USB_VENDOR_ID_LOGITECH, (product))
@@ -4376,9 +4361,6 @@ static const struct hid_device_id hidpp_devices[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01e) },

	{ /* MX Master 3 mouse over Bluetooth */

	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb023) },



	{ /* And try to enable HID++ for all the Logitech Bluetooth devices */

	  HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_ANY, USB_VENDOR_ID_LOGITECH, HID_ANY_ID) },

	{}

};
@@ -4392,7 +4374,6 @@ static const struct hid_usage_id hidpp_usages[] = { 
static struct hid_driver hidpp_driver = {

	.name = "logitech-hidpp-device",

	.id_table = hidpp_devices,

	.match = hidpp_match,

	.report_fixup = hidpp_report_fixup,

	.probe = hidpp_probe,

	.remove = hidpp_remove,