Skip to content

Commit 5b4ffb1

Browse files
author
Jiri Kosina
committed
Revert "HID: logitech-dj: Add support for a new lightspeed receiver iteration"
This reverts commit 9d1bd93. 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: <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent c550921 commit 5b4ffb1

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

drivers/hid/hid-ids.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,6 @@
868868
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2 0xc534
869869
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1 0xc539
870870
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1 0xc53f
871-
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2 0xc547
872871
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY 0xc53a
873872
#define USB_DEVICE_ID_SPACETRAVELLER 0xc623
874873
#define USB_DEVICE_ID_SPACENAVIGATOR 0xc626

drivers/hid/hid-logitech-dj.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,12 +1695,11 @@ static int logi_dj_raw_event(struct hid_device *hdev,
16951695
}
16961696
/*
16971697
* Mouse-only receivers send unnumbered mouse data. The 27 MHz
1698-
* receiver uses 6 byte packets, the nano receiver 8 bytes,
1699-
* the lightspeed receiver (Pro X Superlight) 13 bytes.
1698+
* receiver uses 6 byte packets, the nano receiver 8 bytes.
17001699
*/
17011700
if (djrcv_dev->unnumbered_application == HID_GD_MOUSE &&
1702-
size <= 13){
1703-
u8 mouse_report[14];
1701+
size <= 8) {
1702+
u8 mouse_report[9];
17041703

17051704
/* Prepend report id */
17061705
mouse_report[0] = REPORT_TYPE_MOUSE;
@@ -1984,10 +1983,6 @@ static const struct hid_device_id logi_dj_receivers[] = {
19841983
HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
19851984
USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1),
19861985
.driver_data = recvr_type_gaming_hidpp},
1987-
{ /* Logitech lightspeed receiver (0xc547) */
1988-
HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,
1989-
USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2),
1990-
.driver_data = recvr_type_gaming_hidpp},
19911986

19921987
{ /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */
19931988
HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),

0 commit comments

Comments
 (0)