Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b09f18 authored by Peter Boström's avatar Peter Boström Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Add iFunction or iInterface to device names 



Permits distinguishing between two /dev/videoX entries from the same
physical UVC device (that naturally share the same iProduct name).

This change matches current Windows behavior by prioritizing iFunction
over iInterface, but unlike Windows it displays both iProduct and
iFunction/iInterface strings when both are available.

Signed-off-by: default avatarPeter Boström <pbos@google.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 7b848ed6

drivers/media/usb/uvc/uvc_driver.c

+22 −3
Original line number Diff line number Diff line
@@ -2013,6 +2013,7 @@ static int uvc_probe(struct usb_interface *intf, 
{

	struct usb_device *udev = interface_to_usbdev(intf);

	struct uvc_device *dev;

	int function;

	int ret;



	if (id->idVendor && id->idProduct)
@@ -2048,6 +2049,24 @@ static int uvc_probe(struct usb_interface *intf, 
			 le16_to_cpu(udev->descriptor.idVendor),

			 le16_to_cpu(udev->descriptor.idProduct));



	/*

	 * Add iFunction or iInterface to names when available as additional

	 * distinguishers between interfaces. iFunction is prioritized over

	 * iInterface which matches Windows behavior at the point of writing.

	 */

	if (intf->intf_assoc && intf->intf_assoc->iFunction != 0)

		function = intf->intf_assoc->iFunction;

	else

		function = intf->cur_altsetting->desc.iInterface;

	if (function != 0) {

		size_t len;



		strlcat(dev->name, ": ", sizeof(dev->name));

		len = strlen(dev->name);

		usb_string(udev, function, dev->name + len,

			   sizeof(dev->name) - len);

	}



	/* Parse the Video Class control descriptor. */

	if (uvc_parse_control(dev) < 0) {

		uvc_trace(UVC_TRACE_PROBE, "Unable to parse UVC "