summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2022-12-13 14:35:07 +0100
committerJiri Kosina <jkosina@suse.cz>2022-12-13 14:35:07 +0100
commit3daac75d283f47f9e605792cb8337e306f00f4d1 (patch)
tree8479d95ef51a25525a5a65fc225cd2a506520673 /drivers
parent57383f3c048d421e6dcc73aba43eef1c73142203 (diff)
parent8b7e58409b1813c58eea542d9f3b8db35b4ac1f7 (diff)
downloadlinux-rpi-3daac75d283f47f9e605792cb8337e306f00f4d1.tar.gz
linux-rpi-3daac75d283f47f9e605792cb8337e306f00f4d1.tar.bz2
linux-rpi-3daac75d283f47f9e605792cb8337e306f00f4d1.zip
Merge branch 'for-6.2/logitech' into for-linus
- always send SwID in GetProtocolVersion for Logitech HID++ (Andreas Bergmeier)
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-logitech-hidpp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 8a2aac18dcc5..c6e4a96e882e 100644
--- 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) {