From: Ricardo Ribalda <ribalda@chromium.org>
To: Yunke Cao <yunkec@chromium.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: linux-media@vger.kernel.org,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
linux-kernel@vger.kernel.org,
Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v4 3/3] media: uvcvideo: Add a unique suffix to camera names
Date: Fri, 02 Dec 2022 18:08:19 +0100 [thread overview]
Message-ID: <20220920-resend-meta-v4-3-3ac355b66723@chromium.org> (raw)
In-Reply-To: <20220920-resend-meta-v4-0-3ac355b66723@chromium.org>
Some cameras have multiple data inputs (i.e. IR sensor and RGB sensor),
append a unique number to the device name.
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>
---
drivers/media/usb/uvc/uvc_driver.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 215fb483efb0..f4032ebb3689 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1963,7 +1963,8 @@ int uvc_register_video_device(struct uvc_device *dev,
break;
}
- strscpy(vdev->name, dev->name, sizeof(vdev->name));
+ snprintf(vdev->name, sizeof(vdev->name), "%s %u", dev->name,
+ stream->header.bTerminalLink);
/*
* Set the driver data before calling video_register_device, otherwise
--
2.39.0.rc0.267.gcb52ba06e7-goog-b4-0.11.0-dev-696ae
next prev parent reply other threads:[~2022-12-02 17:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-02 17:08 [PATCH v4 0/3] Add Meta: to Metadata devices Ricardo Ribalda
2022-12-02 17:08 ` [PATCH v4 1/3] media: v4l2-dev.c: Add Meta: to the name of metadata devices Ricardo Ribalda
2022-12-05 5:02 ` Yunke Cao
2022-12-05 22:03 ` Laurent Pinchart
2022-12-21 22:16 ` Mauro Carvalho Chehab
2022-12-21 22:21 ` Laurent Pinchart
2022-12-02 17:08 ` [PATCH v4 2/3] media: Documentation/driver-api: Document device name Ricardo Ribalda
2022-12-05 5:06 ` Yunke Cao
2022-12-02 17:08 ` Ricardo Ribalda [this message]
2022-12-05 5:04 ` [PATCH v4 3/3] media: uvcvideo: Add a unique suffix to camera names Yunke Cao
2022-12-05 22:15 ` Laurent Pinchart
2022-12-05 23:02 ` Ricardo Ribalda
2022-12-20 23:00 ` Ricardo Ribalda
2022-12-21 10:55 ` Laurent Pinchart
2022-12-21 10:57 ` Ricardo Ribalda
2022-12-21 11:23 ` Laurent Pinchart
2022-12-21 20:21 ` Ricardo Ribalda
2022-12-21 22:27 ` Laurent Pinchart
2022-12-21 22:02 ` Mauro Carvalho Chehab
2022-12-21 22:24 ` Laurent Pinchart
2022-12-21 22:54 ` Mauro Carvalho Chehab
2022-12-21 23:00 ` Laurent Pinchart
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=20220920-resend-meta-v4-3-3ac355b66723@chromium.org \
--to=ribalda@chromium.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
--cc=senozhatsky@chromium.org \
--cc=yunkec@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.