diff options
| author | Bastien Nocera <hadess@hadess.net> | 2019-10-16 11:39:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-12 11:01:55 -0800 |
| commit | aeebf2b5466506546c47ca68477d4aa8a96377a6 (patch) | |
| tree | 83b03ebf1895240b526c3416468e21b4685cdde3 /drivers/usb/core | |
| parent | c9d503370f240934f3c1c5da4c6c2452a7d05db2 (diff) | |
USB: Implement usb_device_match_id()
Match a usb_device with a table of IDs.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20191016093933.693-4-hadess@hadess.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/driver.c | 14 | ||||
| -rw-r--r-- | drivers/usb/core/usb.h | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index d3787d084937..697898327b44 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -800,6 +800,20 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface, } EXPORT_SYMBOL_GPL(usb_match_id); +const struct usb_device_id *usb_device_match_id(struct usb_device *udev, + const struct usb_device_id *id) +{ + if (!id) + return NULL; + + for (; id->idVendor || id->idProduct ; id++) { + if (usb_match_device(udev, id)) + return id; + } + + return NULL; +} + static int usb_device_match(struct device *dev, struct device_driver *drv) { /* devices and interfaces are handled separately */ diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index bbe24817315e..f1dc63848219 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -69,6 +69,8 @@ extern int usb_match_one_id_intf(struct usb_device *dev, const struct usb_device_id *id); extern int usb_match_device(struct usb_device *dev, const struct usb_device_id *id); +extern const struct usb_device_id *usb_device_match_id(struct usb_device *udev, + const struct usb_device_id *id); extern void usb_forced_unbind_intf(struct usb_interface *intf); extern void usb_unbind_and_rebind_marked_interfaces(struct usb_device *udev); |