[PATCH 5.8 236/255] USB: Also match device drivers using the ->match vfunc

[Greg Kroah-Hartman]

From: Bastien Nocera <had...@hadess.net>

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 <had...@hadess.net>
Cc: stable <sta...@vger.kernel.org>
Acked-by: Alan Stern <st...@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20200818110445.509668-1-had...@hadess.net
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/usb/core/generic.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -207,8 +207,9 @@ static int __check_usb_generic(struct de
                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)