Commit 5b4ffb17 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Revert "HID: logitech-dj: Add support for a new lightspeed receiver iteration" 

This reverts commit 9d1bd934.

Multiple people reported misbehaving devices and reverting this commit fixes
the problem for them. As soon as the original commit author starts reacting
again, we can try to figure out why he hasn't seen the issues (mismatching
report descriptors?), but for the time being, fix for 6.7 by reverting.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=218172
Link: https://bugzilla.kernel.org/show_bug.cgi?id=218094



Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c5509218

drivers/hid/hid-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -868,7 +868,6 @@ 
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2		0xc534

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1	0xc539

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1	0xc53f

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2	0xc547

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY	0xc53a

#define USB_DEVICE_ID_SPACETRAVELLER	0xc623

#define USB_DEVICE_ID_SPACENAVIGATOR	0xc626

drivers/hid/hid-logitech-dj.c

+3 −8
Original line number Diff line number Diff line
@@ -1695,12 +1695,11 @@ static int logi_dj_raw_event(struct hid_device *hdev, 
		}

		/*

		 * Mouse-only receivers send unnumbered mouse data. The 27 MHz

		 * receiver uses 6 byte packets, the nano receiver 8 bytes,

		 * the lightspeed receiver (Pro X Superlight) 13 bytes.

		 * receiver uses 6 byte packets, the nano receiver 8 bytes.

		 */

		if (djrcv_dev->unnumbered_application == HID_GD_MOUSE &&

		    size <= 13){

			u8 mouse_report[14];

		    size <= 8) {

			u8 mouse_report[9];



			/* Prepend report id */

			mouse_report[0] = REPORT_TYPE_MOUSE;
@@ -1984,10 +1983,6 @@ static const struct hid_device_id logi_dj_receivers[] = { 
	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1),

	 .driver_data = recvr_type_gaming_hidpp},

	{ /* Logitech lightspeed receiver (0xc547) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2),

	 .driver_data = recvr_type_gaming_hidpp},



	{ /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),