diff mbox series

HID: logitech-dj: Fix an error in mse_bluetooth_descriptor

Message ID 20201114094531.8285-1-hdegoede@redhat.com (mailing list archive)
State New
Delegated to: Jiri Kosina
Headers show
Series HID: logitech-dj: Fix an error in mse_bluetooth_descriptor | expand

Commit Message

Hans de Goede Nov. 14, 2020, 9:45 a.m. UTC
Fix an error in the mouse / INPUT(2) descriptor used for quad/bt2.0 combo
receivers. Replace INPUT with INPUT (Data,Var,Abs) for the field for the
4 extra buttons which share their report-byte with the low-res hwheel.

This is likely a copy and paste error. I've verified that the new
0x81, 0x02 value matches both the mouse descriptor for the currently
supported MX5000 / MX5500 receivers, as well as the INPUT(2) mouse
descriptors for the Dinovo receivers for which support is being
worked on.

Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/hid/hid-logitech-dj.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Benjamin Tissoires Nov. 19, 2020, 3:10 p.m. UTC | #1
Hi Hans,

[sorry for taking long to get to this, I wanted to conduct some tests
with the Dinovo Mini with this patch and the series after]

On Sat, Nov 14, 2020 at 10:45 AM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Fix an error in the mouse / INPUT(2) descriptor used for quad/bt2.0 combo
> receivers. Replace INPUT with INPUT (Data,Var,Abs) for the field for the
> 4 extra buttons which share their report-byte with the low-res hwheel.
>
> This is likely a copy and paste error. I've verified that the new
> 0x81, 0x02 value matches both the mouse descriptor for the currently
> supported MX5000 / MX5500 receivers, as well as the INPUT(2) mouse
> descriptors for the Dinovo receivers for which support is being
> worked on.
>
> Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")

I suppose you also want a cc:stable tag here too?

I have added the patch to my local tests, and if you are happy with
it, I can push it upstream.

Cheers,
Benjamin

> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  drivers/hid/hid-logitech-dj.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
> index d3471d655ab4..7706454de88f 100644
> --- a/drivers/hid/hid-logitech-dj.c
> +++ b/drivers/hid/hid-logitech-dj.c
> @@ -330,7 +330,7 @@ static const char mse_bluetooth_descriptor[] = {
>         0x25, 0x01,             /*      LOGICAL_MAX (1)                 */
>         0x75, 0x01,             /*      REPORT_SIZE (1)                 */
>         0x95, 0x04,             /*      REPORT_COUNT (4)                */
> -       0x81, 0x06,             /*      INPUT                           */
> +       0x81, 0x02,             /*      INPUT (Data,Var,Abs)            */
>         0xC0,                   /*    END_COLLECTION                    */
>         0xC0,                   /*  END_COLLECTION                      */
>  };
> --
> 2.28.0
>
Hans de Goede Nov. 19, 2020, 3:12 p.m. UTC | #2
Hi,

On 11/19/20 4:10 PM, Benjamin Tissoires wrote:
> Hi Hans,
> 
> [sorry for taking long to get to this, I wanted to conduct some tests
> with the Dinovo Mini with this patch and the series after]

No problem.

> On Sat, Nov 14, 2020 at 10:45 AM Hans de Goede <hdegoede@redhat.com> wrote:
>>
>> Fix an error in the mouse / INPUT(2) descriptor used for quad/bt2.0 combo
>> receivers. Replace INPUT with INPUT (Data,Var,Abs) for the field for the
>> 4 extra buttons which share their report-byte with the low-res hwheel.
>>
>> This is likely a copy and paste error. I've verified that the new
>> 0x81, 0x02 value matches both the mouse descriptor for the currently
>> supported MX5000 / MX5500 receivers, as well as the INPUT(2) mouse
>> descriptors for the Dinovo receivers for which support is being
>> worked on.
>>
>> Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
> 
> I suppose you also want a cc:stable tag here too?

In my experience the stable maintainers pick up most patches with
a fixes tag anyways. With that said adding a cc:stable tag is fine.

> I have added the patch to my local tests, and if you are happy with
> it, I can push it upstream.

Pushing this patch upstream is fine with me.

Regards,

Hans



>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>>  drivers/hid/hid-logitech-dj.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
>> index d3471d655ab4..7706454de88f 100644
>> --- a/drivers/hid/hid-logitech-dj.c
>> +++ b/drivers/hid/hid-logitech-dj.c
>> @@ -330,7 +330,7 @@ static const char mse_bluetooth_descriptor[] = {
>>         0x25, 0x01,             /*      LOGICAL_MAX (1)                 */
>>         0x75, 0x01,             /*      REPORT_SIZE (1)                 */
>>         0x95, 0x04,             /*      REPORT_COUNT (4)                */
>> -       0x81, 0x06,             /*      INPUT                           */
>> +       0x81, 0x02,             /*      INPUT (Data,Var,Abs)            */
>>         0xC0,                   /*    END_COLLECTION                    */
>>         0xC0,                   /*  END_COLLECTION                      */
>>  };
>> --
>> 2.28.0
>>
>
Benjamin Tissoires Nov. 19, 2020, 3:39 p.m. UTC | #3
On Thu, Nov 19, 2020 at 4:12 PM Hans de Goede <hdegoede@redhat.com> wrote:
>
> Hi,
>
> On 11/19/20 4:10 PM, Benjamin Tissoires wrote:
> > Hi Hans,
> >
> > [sorry for taking long to get to this, I wanted to conduct some tests
> > with the Dinovo Mini with this patch and the series after]
>
> No problem.
>
> > On Sat, Nov 14, 2020 at 10:45 AM Hans de Goede <hdegoede@redhat.com> wrote:
> >>
> >> Fix an error in the mouse / INPUT(2) descriptor used for quad/bt2.0 combo
> >> receivers. Replace INPUT with INPUT (Data,Var,Abs) for the field for the
> >> 4 extra buttons which share their report-byte with the low-res hwheel.
> >>
> >> This is likely a copy and paste error. I've verified that the new
> >> 0x81, 0x02 value matches both the mouse descriptor for the currently
> >> supported MX5000 / MX5500 receivers, as well as the INPUT(2) mouse
> >> descriptors for the Dinovo receivers for which support is being
> >> worked on.
> >>
> >> Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
> >
> > I suppose you also want a cc:stable tag here too?
>
> In my experience the stable maintainers pick up most patches with
> a fixes tag anyways. With that said adding a cc:stable tag is fine.
>
> > I have added the patch to my local tests, and if you are happy with
> > it, I can push it upstream.
>
> Pushing this patch upstream is fine with me.

Alright, this is now done, and with 1/3 of the RFC of the dinovo mini series

Cheers,
Benjamin

>
> Regards,
>
> Hans
>
>
>
> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> >> ---
> >>  drivers/hid/hid-logitech-dj.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
> >> index d3471d655ab4..7706454de88f 100644
> >> --- a/drivers/hid/hid-logitech-dj.c
> >> +++ b/drivers/hid/hid-logitech-dj.c
> >> @@ -330,7 +330,7 @@ static const char mse_bluetooth_descriptor[] = {
> >>         0x25, 0x01,             /*      LOGICAL_MAX (1)                 */
> >>         0x75, 0x01,             /*      REPORT_SIZE (1)                 */
> >>         0x95, 0x04,             /*      REPORT_COUNT (4)                */
> >> -       0x81, 0x06,             /*      INPUT                           */
> >> +       0x81, 0x02,             /*      INPUT (Data,Var,Abs)            */
> >>         0xC0,                   /*    END_COLLECTION                    */
> >>         0xC0,                   /*  END_COLLECTION                      */
> >>  };
> >> --
> >> 2.28.0
> >>
> >
>
diff mbox series

Patch

diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
index d3471d655ab4..7706454de88f 100644
--- a/drivers/hid/hid-logitech-dj.c
+++ b/drivers/hid/hid-logitech-dj.c
@@ -330,7 +330,7 @@  static const char mse_bluetooth_descriptor[] = {
 	0x25, 0x01,		/*      LOGICAL_MAX (1)                 */
 	0x75, 0x01,		/*      REPORT_SIZE (1)                 */
 	0x95, 0x04,		/*      REPORT_COUNT (4)                */
-	0x81, 0x06,		/*      INPUT                           */
+	0x81, 0x02,		/*      INPUT (Data,Var,Abs)            */
 	0xC0,			/*    END_COLLECTION                    */
 	0xC0,			/*  END_COLLECTION                      */
 };