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

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

media: Revert "media: uvcvideo: Set unique vdev name based in type" 

commit f66dcb32af19faf49cc4a9222c3152b10c6ec84a upstream.

A lot of userspace depends on a descriptive name for vdev. Without this
patch, users have a hard time figuring out which camera shall they use
for their video conferencing.

This reverts commit e3f60e7e1a2b451f538f9926763432249bcf39c4.

Link: https://lore.kernel.org/linux-media/20211207003840.1212374-2-ribalda@chromium.org


Cc: <stable@vger.kernel.org>
Fixes: e3f60e7e1a2b ("media: uvcvideo: Set unique vdev name based in type")
Reported-by: default avatarNicolas Dufresne <nicolas@ndufresne.ca>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e07beda

drivers/media/usb/uvc/uvc_driver.c

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

			      const struct v4l2_file_operations *fops,

			      const struct v4l2_ioctl_ops *ioctl_ops)

			      const struct v4l2_ioctl_ops *ioctl_ops)

{

{

	const char *name;

	int ret;

	int ret;





	/* Initialize the video buffers queue. */

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

	case V4L2_BUF_TYPE_VIDEO_CAPTURE:

	default:

	default:

		vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

		vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

		name = "Video Capture";

		break;

		break;

	case V4L2_BUF_TYPE_VIDEO_OUTPUT:

	case V4L2_BUF_TYPE_VIDEO_OUTPUT:

		vdev->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

		vdev->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

		name = "Video Output";

		break;

		break;

	case V4L2_BUF_TYPE_META_CAPTURE:

	case V4L2_BUF_TYPE_META_CAPTURE:

		vdev->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;

		vdev->device_caps = V4L2_CAP_META_CAPTURE | V4L2_CAP_STREAMING;

		name = "Metadata";

		break;

		break;

	}

	}





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

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

		 stream->header.bTerminalLink);





	/*

	/*

	 * Set the driver data before calling video_register_device, otherwise

	 * Set the driver data before calling video_register_device, otherwise