diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:11:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-31 07:11:45 +0200 |
| commit | 5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2 (patch) | |
| tree | 777c39ad4586149de154be3c4c102f751336a37b /drivers/usb/core/generic.c | |
| parent | usb: typec: tcpm: Migrate workqueue to RT priority for processing events (diff) | |
| parent | Linux 5.9-rc3 (diff) | |
| download | linux-dev-5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2.tar.xz linux-dev-5fedf0d295d3ef69fd85fdee4cb68fd3756b54c2.zip | |
Merge 5.9-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/generic.c')
| -rw-r--r-- | drivers/usb/core/generic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c index d27ac8e78b2e..22c887f5c497 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -205,8 +205,9 @@ 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; - - return usb_device_match_id(udev, udrv->id_table) != NULL; + if (usb_device_match_id(udev, udrv->id_table) != NULL) + return 1; + return (udrv->match && udrv->match(udev)); } static bool usb_generic_driver_match(struct usb_device *udev) |