summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2009-01-20 22:19:25 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 17:42:27 +0200
commite22ed887ee18fde79c013825017521ec64eb8ed5 (patch)
tree1cb8c21bc5a6acf32da8f045deb2f434152ab4e9
parentV4L/DVB (10308): uvcvideo: use usb_make_path to report bus info (diff)
downloadlinux-e22ed887ee18fde79c013825017521ec64eb8ed5.tar.xz
linux-e22ed887ee18fde79c013825017521ec64eb8ed5.zip
V4L/DVB (10309): s2255drv: 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/s2255drv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 31bc94075268..b5be633e3bb0 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -846,8 +846,7 @@ static int vidioc_querycap(struct file *file, void *priv,
struct s2255_dev *dev = fh->dev;
strlcpy(cap->driver, "s2255", sizeof(cap->driver));
strlcpy(cap->card, "s2255", sizeof(cap->card));
- strlcpy(cap->bus_info, dev_name(&dev->udev->dev),
- sizeof(cap->bus_info));
+ usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
cap->version = S2255_VERSION;
cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
return 0;