From 5369a6ad267508d395e78bd8e8558baf4ddb6e29 Mon Sep 17 00:00:00 2001 From: Thierry MERLE Date: Tue, 27 Jan 2009 16:53:23 -0300 Subject: [PATCH] --- yaml --- r: 137739 b: refs/heads/master c: b12049a2c3d31e5a167a50ea842b0e7ed3024b80 h: refs/heads/master i: 137737: 9c7627900daa9334dc6f2f7f492e5511f7b5f60b 137735: 9c7be3b1736fc7ebf1b8c54de4f1fe49158494bd v: v3 --- [refs] | 2 +- trunk/drivers/media/video/uvc/uvc_v4l2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 078b5e045c1f..e79619d96b21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb97716f3bcc3710b5dc44c01fd7450d032c74e0 +refs/heads/master: b12049a2c3d31e5a167a50ea842b0e7ed3024b80 diff --git a/trunk/drivers/media/video/uvc/uvc_v4l2.c b/trunk/drivers/media/video/uvc/uvc_v4l2.c index 011ebd4da44a..30781b82b6b5 100644 --- a/trunk/drivers/media/video/uvc/uvc_v4l2.c +++ b/trunk/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