From: Kieran Bingham <kieran.bingham@xxxxxxxxxxxxxxxx> With multiple UVC gadgets on a composite device, the device names become indistinguishable from one another. Extend the gadget video name to incorporate the function instance name, along side the existing UDC controller name. Signed-off-by: Kieran Bingham <kieran.bingham@xxxxxxxxxxxxxxxx> --- drivers/usb/gadget/function/f_uvc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 1affa8e3a974..65454a31ad68 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -433,7 +433,9 @@ uvc_register_video(struct uvc_device *uvc) uvc->vdev.release = video_device_release_empty; uvc->vdev.vfl_dir = VFL_DIR_TX; uvc->vdev.lock = &uvc->video.mutex; - strlcpy(uvc->vdev.name, cdev->gadget->name, sizeof(uvc->vdev.name)); + + snprintf(uvc->vdev.name, sizeof(uvc->vdev.name), "%s:%s", + cdev->gadget->name, uvc->func.fi->group.cg_item.ci_name); video_set_drvdata(&uvc->vdev, uvc); -- 2.17.0 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
