On Sat, Dec 3, 2022 at 2:08 AM Ricardo Ribalda <ribalda@xxxxxxxxxxxx> wrote: > > 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@xxxxxxxxxxxx> > --- > 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 Reviewed-by: Yunke Cao <yunkec@xxxxxxxxxxxx>
