[1/1] HID: Send SwID in GetProtocolVersion

Message ID 20221111194526.1375601-1-abergmeier@gmx.net
State New
Headers
Series [1/1] HID: Send SwID in GetProtocolVersion |

Commit Message

Andreas Bergmeier Nov. 11, 2022, 7:45 p.m. UTC
  According to docs a SwID should be sent for GetProtocolVersion.
> 0x10.DeviceIndex.0x00.0x1n
where n is SwID

Signed-off-by: Andreas Bergmeier <abergmeier@gmx.net>
---
 drivers/hid/hid-logitech-hidpp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.34.1
  

Comments

Bastien Nocera Nov. 14, 2022, 2:19 p.m. UTC | #1
On Fri, 2022-11-11 at 20:45 +0100, Andreas Bergmeier wrote:
> According to docs a SwID should be sent for GetProtocolVersion.
> > 0x10.DeviceIndex.0x00.0x1n
> where n is SwID

I would mention the value of CMD_ROOT_GET_PROTOCOL_VERSION (0x10) in
the commit message, but otherwise looks good to me.

Reviewed-by: Bastien Nocera <hadess@hadess.net>

> 
> Signed-off-by: Andreas Bergmeier <abergmeier@gmx.net>
> ---
>  drivers/hid/hid-logitech-hidpp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-
> logitech-hidpp.c
> index a0c148a8df6c..964a523c3de7 100644
> --- a/drivers/hid/hid-logitech-hidpp.c
> +++ b/drivers/hid/hid-logitech-hidpp.c
> @@ -896,7 +896,7 @@ static int hidpp_root_get_protocol_version(struct
> hidpp_device *hidpp)
> 
>         ret = hidpp_send_rap_command_sync(hidpp,
>                         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) {
> --
> 2.34.1
>
  
Jiri Kosina Nov. 21, 2022, 9:35 p.m. UTC | #2
On Fri, 11 Nov 2022, Andreas Bergmeier wrote:

> According to docs a SwID should be sent for GetProtocolVersion.
> > 0x10.DeviceIndex.0x00.0x1n
> where n is SwID
> 
> Signed-off-by: Andreas Bergmeier <abergmeier@gmx.net>
> ---
>  drivers/hid/hid-logitech-hidpp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
> index a0c148a8df6c..964a523c3de7 100644
> --- a/drivers/hid/hid-logitech-hidpp.c
> +++ b/drivers/hid/hid-logitech-hidpp.c
> @@ -896,7 +896,7 @@ static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
> 
>  	ret = hidpp_send_rap_command_sync(hidpp,
>  			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) {

Applied, thanks Andreas.
  

Patch

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index a0c148a8df6c..964a523c3de7 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -896,7 +896,7 @@  static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)

 	ret = hidpp_send_rap_command_sync(hidpp,
 			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) {