On Wed, Dec 7, 2022 at 10:13 AM Rafael J. Wysocki <rjw@xxxxxxxxxxxxx> wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > > Some special HID drivers (for example, hid-logitech-hidpp) use ->match() > callbacks to reject specific devices that otherwise would match the > driver's device ID list, with the expectation that those devices will > be handled by some other drivers. However, this doesn't work if > hid-generic is expected to bind to the given device, because its > ->match() callback, hid_generic_match(), rejects all devices that match > device ID lists of the other HID drivers regardless of what is returned > by the other drivers' ->match() callbacks. Thanks Rafael for spotting that corner case in the ->match() processing. > > To make it work, amend the function used by hid_generic_match() for > checking an individual driver, __check_hid_generic(), with a check > involving the given driver's ->match() callback, so 0 is returned > when that callback rejects the device in question. Shouldn't we add that logic to hid_match_device() directly in hid-core.c instead? It feels wrong to have a function named "hid_match_device()" and have to manually call later "->match()" on the driver itself. Ack on the general idea anyway. > > Fixes: 532223c8ac57 ("HID: logitech-hidpp: Enable HID++ for all the Logitech Bluetooth devices") > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > --- > drivers/hid/hid-generic.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > Index: linux-pm/drivers/hid/hid-generic.c > =================================================================== > --- linux-pm.orig/drivers/hid/hid-generic.c > +++ linux-pm/drivers/hid/hid-generic.c > @@ -31,7 +31,13 @@ static int __check_hid_generic(struct de > if (hdrv == &hid_generic) > return 0; > > - return hid_match_device(hdev, hdrv) != NULL; > + if (!hid_match_device(hdev, hdrv)) > + return 0; > + > + if (hdrv->match) > + return hdrv->match(hdev, false); > + > + return 1; > } > > static bool hid_generic_match(struct hid_device *hdev, > > >