On Mon, Oct 7, 2019 at 7:13 AM Andrey Smirnov <[email protected]> wrote: > > G920 device only advertises REPORT_ID_HIDPP_LONG and > REPORT_ID_HIDPP_VERY_LONG in its HID report descriptor, so querying > for REPORT_ID_HIDPP_SHORT with optional=false will always fail and > prevent G920 to be recognized as a valid HID++ device. > > Modify hidpp_validate_device() to check only REPORT_ID_HIDPP_LONG with > optional=false on G920 to fix this. > > Fixes: fe3ee1ec007b ("HID: logitech-hidpp: allow non HID++ devices to be > handled by this module") > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204191 > Reported-by: Sam Bazely <[email protected]> > Signed-off-by: Andrey Smirnov <[email protected]> > Cc: Jiri Kosina <[email protected]> > Cc: Benjamin Tissoires <[email protected]> > Cc: Henrik Rydberg <[email protected]> > Cc: Sam Bazely <[email protected]> > Cc: Pierre-Loup A. Griffais <[email protected]> > Cc: Austin Palmer <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > --- > drivers/hid/hid-logitech-hidpp.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/hid/hid-logitech-hidpp.c > b/drivers/hid/hid-logitech-hidpp.c > index cadf36d6c6f3..f415bf398e17 100644 > --- a/drivers/hid/hid-logitech-hidpp.c > +++ b/drivers/hid/hid-logitech-hidpp.c > @@ -3511,6 +3511,12 @@ static bool hidpp_validate_report(struct hid_device > *hdev, int id, > > static bool hidpp_validate_device(struct hid_device *hdev) > { > + struct hidpp_device *hidpp = hid_get_drvdata(hdev); > + > + if (hidpp->quirks & HIDPP_QUIRK_CLASS_G920) > + return hidpp_validate_report(hdev, REPORT_ID_HIDPP_LONG, > + HIDPP_REPORT_SHORT_LENGTH, > false); > +
with https://patchwork.kernel.org/patch/11184749/ we also have a need for such a trick for BLE mice. I wonder if we should not have a more common way of validating the devices This can probably be handled later, as your patch fixes the current devices. Cheers, Benjamin > return hidpp_validate_report(hdev, REPORT_ID_HIDPP_SHORT, > HIDPP_REPORT_SHORT_LENGTH, false) && > hidpp_validate_report(hdev, REPORT_ID_HIDPP_LONG, > -- > 2.21.0 >
