diff options
| author | Bastien Nocera <hadess@hadess.net> | 2020-08-18 13:04:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-03 11:29:49 +0200 |
| commit | a18d5d456c009d69bd032fc96f4751d58e6ccc3a (patch) | |
| tree | e7254d39526210aef6c53a5d8be7439104a0c869 | |
| parent | 0ca26ffe3c1f381f95a0c0bbb5e8241d8c7183cc (diff) | |
| download | linux-stable-a18d5d456c009d69bd032fc96f4751d58e6ccc3a.tar.gz linux-stable-a18d5d456c009d69bd032fc96f4751d58e6ccc3a.tar.bz2 linux-stable-a18d5d456c009d69bd032fc96f4751d58e6ccc3a.zip | |
USB: Also match device drivers using the ->match vfunc
commit adb6e6ac20eedcf1dce19dc75b224e63c0828ea1 upstream.
We only ever used the ID table matching before, but we should also support
open-coded match functions.
Fixes: 88b7381a939de ("USB: Select better matching USB drivers when available")
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Cc: stable <stable@vger.kernel.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20200818110445.509668-1-hadess@hadess.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 4626227a6dd2..cd08a47144bd 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -207,8 +207,9 @@ static int __check_usb_generic(struct device_driver *drv, void *data) return 0; if (!udrv->id_table) 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) |