lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 224/917] media: uvcvideo: Set unique vdev name based in type
    Date
    From: Ricardo Ribalda <ribalda@chromium.org>

    [ Upstream commit e3f60e7e1a2b451f538f9926763432249bcf39c4 ]

    All the entities must have a unique name. We can have a descriptive and
    unique name by appending the function and the entity->id.

    This is even resilent to multi chain devices.

    Fixes v4l2-compliance:
    Media Controller ioctls:
    fail: v4l2-test-media.cpp(205): v2_entity_names_set.find(key) != v2_entity_names_set.end()
    test MEDIA_IOC_G_TOPOLOGY: FAIL
    fail: v4l2-test-media.cpp(394): num_data_links != num_links
    test MEDIA_IOC_ENUM_ENTITIES/LINKS: FAIL

    Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
    Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/usb/uvc/uvc_driver.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
    index 9a791d8ef200d..c4bc67024534a 100644
    --- a/drivers/media/usb/uvc/uvc_driver.c
    +++ b/drivers/media/usb/uvc/uvc_driver.c
    @@ -2194,6 +2194,7 @@ 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,16 +2223,20 @@ 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;
    }

    - strscpy(vdev->name, dev->name, sizeof(vdev->name));
    + snprintf(vdev->name, sizeof(vdev->name), "%s %u", name,
    + stream->header.bTerminalLink);

    /*
    * Set the driver data before calling video_register_device, otherwise
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 02:10    [W:4.018 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site