On Sun, 2020-07-05 at 02:48 +0000, Mazin Rezk wrote:
> Some parts of hid-logitech-dj explicitly referred to 0xff for the
> receiver index. This patch changes those references to the
> HIDPP_RECEIVER_INDEX definition.
>
> Signed-off-by: Mazin Rezk <mnrzk@xxxxxxxxxxxxxx>
> ---
> drivers/hid/hid-logitech-dj.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-
> logitech-dj.c
> index 48dff5d6b605..a78c13cc9f47 100644
> --- a/drivers/hid/hid-logitech-dj.c
> +++ b/drivers/hid/hid-logitech-dj.c
> @@ -1153,7 +1153,7 @@ static int
> logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
> if (!dj_report)
> return -ENOMEM;
> dj_report->report_id = REPORT_ID_DJ_SHORT;
> - dj_report->device_index = 0xFF;
> + dj_report->device_index = HIDPP_RECEIVER_INDEX;
> dj_report->report_type = REPORT_TYPE_CMD_GET_PAIRED_DEVICES;
> retval = logi_dj_recv_send_report(djrcv_dev, dj_report);
> kfree(dj_report);
> @@ -1175,7 +1175,7 @@ static int
> logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
>
> if (djrcv_dev->type == recvr_type_dj) {
> dj_report->report_id = REPORT_ID_DJ_SHORT;
> - dj_report->device_index = 0xFF;
> + dj_report->device_index = HIDPP_RECEIVER_INDEX;
> dj_report->report_type = REPORT_TYPE_CMD_SWITCH;
> dj_report->report_params[CMD_SWITCH_PARAM_DEVBITFIELD]
> = 0x3F;
> dj_report-
> >report_params[CMD_SWITCH_PARAM_TIMEOUT_SECONDS] =
> @@ -1204,7 +1204,7 @@ static int
> logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
> memset(buf, 0, HIDPP_REPORT_SHORT_LENGTH);
>
> buf[0] = REPORT_ID_HIDPP_SHORT;
> - buf[1] = 0xFF;
> + buf[1] = HIDPP_RECEIVER_INDEX;
> buf[2] = 0x80;
> buf[3] = 0x00;
> buf[4] = 0x00;
> --
> 2.27.0
This is correct :)
Reviewed-by: Filipe Laíns <lains@xxxxxxxxxxxxx>
Cheers,
Filipe Laíns
Attachment:
signature.asc
Description: This is a digitally signed message part
