android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ricardo Ribalda 2021-12-07 01:38:37 +01:00 committed by Greg Kroah-Hartman
parent 7e07bedae1
commit a459686f98
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/usb/uvc/uvc_driver.c
View File

@ -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