Commit aeebf2b5 authored by Bastien Nocera's avatar Bastien Nocera Committed by Greg Kroah-Hartman
Browse files

USB: Implement usb_device_match_id() 



Match a usb_device with a table of IDs.

Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20191016093933.693-4-hadess@hadess.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9d50337

drivers/usb/core/driver.c

+14 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/usb/core/usb.h

+2 −0
Original line number Diff line number Diff line
@@ -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);