Merge branch 'for-6.2/logitech' into for-linus

- always send SwID in GetProtocolVersion for Logitech HID++ (Andreas Bergmeier)

Merge branch 'for-6.2/logitech' into for-linus
- always send SwID in GetProtocolVersion for Logitech HID++ (Andreas Bergmeier)
3daac75d · Jiri Kosina · 57383f3c · 8b7e5840 · 3daac75d
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

drivers/hid/hid-logitech-hidpp.c drivers/hid/hid-logitech-hidpp.c +1 -1

未找到文件。
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -895,7 +895,7 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
 	ret = hidpp_send_rap_command_sync(hidpp,
 			REPORT_ID_HIDPP_SHORT,
 			HIDPP_PAGE_ROOT_IDX,
-			CMD_ROOT_GET_PROTOCOL_VERSION,
+			CMD_ROOT_GET_PROTOCOL_VERSION | LINUX_KERNEL_SW_ID,
 			ping_data, sizeof(ping_data), &response);

 	if (ret == HIDPP_ERROR_INVALID_SUBID) {