diff options
| author | Bastien Nocera <[email protected]> | 2020-10-22 13:55:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2020-10-28 12:24:58 +0000 |
| commit | 0942d59b0af46511d59dbf5bd69ec4a64d1a854c (patch) | |
| tree | 44706a2b20b1129aaf102044c32e7ee99f4bc417 /drivers/usb/core/generic.c | |
| parent | usb: host: ehci-tegra: Fix error handling in tegra_ehci_probe() (diff) | |
| download | kernel-0942d59b0af46511d59dbf5bd69ec4a64d1a854c.tar.gz kernel-0942d59b0af46511d59dbf5bd69ec4a64d1a854c.zip | |
usbcore: Check both id_table and match() when both available
From: Bastien Nocera <[email protected]>
When a USB device driver has both an id_table and a match() function, make
sure to check both to find a match, first matching the id_table, then
checking the match() function.
This makes it possible to have module autoloading done through the
id_table when devices are plugged in, before checking for further
device eligibility in the match() function.
Cc: <[email protected]> # 5.8
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Alan Stern <[email protected]>
Co-developed-by: M. Vefa Bicakci <[email protected]>
Tested-by: Bastien Nocera <[email protected]>
Signed-off-by: Bastien Nocera <[email protected]>
Signed-off-by: M. Vefa Bicakci <[email protected]>
Tested-by: Pan (Pany) YUAN <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/core/generic.c')
| -rw-r--r-- | drivers/usb/core/generic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index 22c887f5c497..26f9fb9f67ca 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -205,9 +205,7 @@ static int __check_for_non_generic_match(struct device_driver *drv, void *data) udrv = to_usb_device_driver(drv); if (udrv == &usb_generic_driver) return 0; - if (usb_device_match_id(udev, udrv->id_table) != NULL) - return 1; - return (udrv->match && udrv->match(udev)); + return usb_driver_applicable(udev, udrv); } static bool usb_generic_driver_match(struct usb_device *udev) |