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

Commit bc4af8c7 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Greg Kroah-Hartman
Browse files

media: uvcvideo: Set unique vdev name based in type 



[ Upstream commit e3f60e7e1a2b451f538f9926763432249bcf39c4 ]

All the entities must have a unique name. We can have a descriptive and
unique name by appending the function and the entity->id.

This is even resilent to multi chain devices.

Fixes v4l2-compliance:
Media Controller ioctls:
                fail: v4l2-test-media.cpp(205): v2_entity_names_set.find(key) != v2_entity_names_set.end()
        test MEDIA_IOC_G_TOPOLOGY: FAIL
                fail: v4l2-test-media.cpp(394): num_data_links != num_links
	test MEDIA_IOC_ENUM_ENTITIES/LINKS: FAIL

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7a646855

drivers/media/usb/uvc/uvc_driver.c

+6 −1
Original line number Diff line number Diff line
@@ -1972,6 +1972,7 @@ int uvc_register_video_device(struct uvc_device *dev, 
			      const struct v4l2_file_operations *fops,

			      const struct v4l2_ioctl_ops *ioctl_ops)

{

	const char *name;

	int ret;



	/* Initialize the video buffers queue. */
@@ -2000,16 +2001,20 @@ int uvc_register_video_device(struct uvc_device *dev, 
	case V4L2_BUF_TYPE_VIDEO_CAPTURE:

	default:

		vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

		name = "Video Capture";

		break;

	case V4L2_BUF_TYPE_VIDEO_OUTPUT:

		vdev->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

		name = "Video Output";

		break;

	case V4L2_BUF_TYPE_META_CAPTURE:

		vdev->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;

		name = "Metadata";

		break;

	}



	strscpy(vdev->name, dev->name, sizeof(vdev->name));

	snprintf(vdev->name, sizeof(vdev->name), "%s %u", name,

		 stream->header.bTerminalLink);



	/*

	 * Set the driver data before calling video_register_device, otherwise