]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: uvcvideo: Use usb_make_path to fill in usb_info
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 1 Feb 2019 09:57:31 +0000 (04:57 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 18 Feb 2019 20:19:49 +0000 (15:19 -0500)
The uvc driver uses this function to fill in bus_info for VIDIOC_QUERYCAP,
so use the same function when filling in the bus_info for the media device.

The current implementation only fills in part of the info. E.g. if the full
bus_info is usb-0000:01:00.0-1.4.2, then the media bus_info only has 1.4.2.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/usb/uvc/uvc_driver.c

index 33a22c0164566bcee57d8d47f5e7fb78a2887c05..10cfe8e516261a67b228a443581218666aba5511 100644 (file)
@@ -2183,7 +2183,7 @@ static int uvc_probe(struct usb_interface *intf,
        if (udev->serial)
                strscpy(dev->mdev.serial, udev->serial,
                        sizeof(dev->mdev.serial));
-       strscpy(dev->mdev.bus_info, udev->devpath, sizeof(dev->mdev.bus_info));
+       usb_make_path(udev, dev->mdev.bus_info, sizeof(dev->mdev.bus_info));
        dev->mdev.hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
        media_device_init(&dev->mdev);