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

BugLink: https://bugs.launchpad.net/bugs/1959698
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 05c60c2f8f358b83412c5fdae87a29052a161855..3be9bc97f8b65d87176eb820e6ee45a6b602ae8b 100644 (file)
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1977,7 +1977,6 @@ 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. */
@@ -2006,20 +2005,16 @@ 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;
        }
 
-       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