5.4-stable patches

added patches:
	media-revert-media-uvcvideo-set-unique-vdev-name-based-in-type.patch

diff --git a/queue-5.4/media-revert-media-uvcvideo-set-unique-vdev-name-based-in-type.patch b/queue-5.4/media-revert-media-uvcvideo-set-unique-vdev-name-based-in-type.patch
new file mode 100644 (file)
index 0000000..05a11c1
--- /dev/null
+++ b/queue-5.4/media-revert-media-uvcvideo-set-unique-vdev-name-based-in-type.patch
@@ -0,0 +1,60 @@
+From f66dcb32af19faf49cc4a9222c3152b10c6ec84a Mon Sep 17 00:00:00 2001
+From: Ricardo Ribalda <ribalda@chromium.org>
+Date: Tue, 7 Dec 2021 01:38:37 +0100
+Subject: media: Revert "media: uvcvideo: Set unique vdev name based in type"
+
+From: Ricardo Ribalda <ribalda@chromium.org>
+
+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: Nicolas Dufresne <nicolas@ndufresne.ca>
+Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/media/usb/uvc/uvc_driver.c |    7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+--- a/drivers/media/usb/uvc/uvc_driver.c
++++ b/drivers/media/usb/uvc/uvc_driver.c
+@@ -1972,7 +1972,6 @@ int uvc_register_video_device(struct uvc
+                             const struct v4l2_file_operations *fops,
+                             const struct v4l2_ioctl_ops *ioctl_ops)
+ {
+-      const char *name;
+       int ret;
+ 
+       /* Initialize the video buffers queue. */
+@@ -2001,20 +2000,16 @@ int uvc_register_video_device(struct uvc
+       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;
+       }
+ 
+-      snprintf(vdev->name, sizeof(vdev->name), "%s %u", name,
+-               stream->header.bTerminalLink);
++      strscpy(vdev->name, dev->name, sizeof(vdev->name));
+ 
+       /*
+        * Set the driver data before calling video_register_device, otherwise

diff --git a/queue-5.4/series b/queue-5.4/series
index a065ff0b898f7a6e3839b7d90a5ee5df07945e57..dfbec745e8f63e4a1dae1bac443181402bc04f5f 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -12,3 +12,4 @@ can-gs_usb-gs_can_start_xmit-zero-initialize-hf-flags-reserved.patch
 random-fix-data-race-on-crng_node_pool.patch
 random-fix-data-race-on-crng-init-time.patch
 random-fix-crash-on-multiple-early-calls-to-add_bootloader_randomness.patch
+media-revert-media-uvcvideo-set-unique-vdev-name-based-in-type.patch