summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2009-01-27 22:53:23 +0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 19:42:27 +0400
commitb12049a2c3d31e5a167a50ea842b0e7ed3024b80 (patch)
tree44f74417b6ac43877202b86f251817ad9f9d0f5f
parentcb97716f3bcc3710b5dc44c01fd7450d032c74e0 (diff)
downloadlinux-b12049a2c3d31e5a167a50ea842b0e7ed3024b80.tar.xz
V4L/DVB (10308): uvcvideo: use usb_make_path to report bus info
usb_make_path reports canonical bus info. Use it when reporting bus info in VIDIOC_QUERYCAP. Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Acked-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/uvc/uvc_v4l2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 011ebd4da44a..30781b82b6b5 100644
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -488,8 +488,8 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
memset(cap, 0, sizeof *cap);
strlcpy(cap->driver, "uvcvideo", sizeof cap->driver);
strlcpy(cap->card, vdev->name, sizeof cap->card);
- strlcpy(cap->bus_info, video->dev->udev->bus->bus_name,
- sizeof cap->bus_info);
+ usb_make_path(video->dev->udev,
+ cap->bus_info, sizeof(cap->bus_info));
cap->version = DRIVER_VERSION_NUMBER;
if (video->streaming->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE