From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: Ricardo Ribalda <ribalda@chromium.org>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH v2 1/4] Revert "media: uvcvideo: Set unique vdev name based in type"
Date: Tue, 7 Dec 2021 10:52:24 +0100 [thread overview]
Message-ID: <6e64bb76-14f5-b492-ca36-775a0011acba@xs4all.nl> (raw)
In-Reply-To: <20211207003840.1212374-2-ribalda@chromium.org>
On 07/12/2021 01:38, Ricardo Ribalda wrote:
> 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.
>
> 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>
Thanks!
Hans
> ---
> drivers/media/usb/uvc/uvc_driver.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
> index 7c007426e082..058d28a0344b 100644
> --- a/drivers/media/usb/uvc/uvc_driver.c
> +++ b/drivers/media/usb/uvc/uvc_driver.c
> @@ -2193,7 +2193,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. */
> @@ -2222,20 +2221,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
>
next prev parent reply other threads:[~2021-12-07 9:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 0:38 [PATCH v2 0/4] uvc: Restore old vdev name Ricardo Ribalda
2021-12-07 0:38 ` [PATCH v2 1/4] Revert "media: uvcvideo: Set unique vdev name based in type" Ricardo Ribalda
2021-12-07 9:52 ` Hans Verkuil [this message]
2021-12-07 0:38 ` [PATCH v2 2/4] media: v4l2-dev.c: Allow driver-defined entity names Ricardo Ribalda
2021-12-07 9:52 ` Hans Verkuil
2021-12-07 0:38 ` [PATCH v2 3/4] media: Documentation/driver-api: Document entity name Ricardo Ribalda
2021-12-07 9:53 ` Hans Verkuil
2021-12-07 0:38 ` [PATCH v2 4/4] media: uvcvideo: Set unique entity name based in type Ricardo Ribalda
2021-12-07 9:57 ` Hans Verkuil
2021-12-14 14:44 ` [PATCH v2 0/4] uvc: Restore old vdev name Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e64bb76-14f5-b492-ca36-775a0011acba@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nicolas@ndufresne.ca \
--cc=ribalda@chromium.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=stable@vger.kernel.org \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).