aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s2255drv.c
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2009-01-20 16:19:25 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:27 -0400
commite22ed887ee18fde79c013825017521ec64eb8ed5 (patch)
tree1cb8c21bc5a6acf32da8f045deb2f434152ab4e9 /drivers/media/video/s2255drv.c
parentb12049a2c3d31e5a167a50ea842b0e7ed3024b80 (diff)
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>
Diffstat (limited to 'drivers/media/video/s2255drv.c')
-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,
846 struct s2255_dev *dev = fh->dev; 846 struct s2255_dev *dev = fh->dev;
847 strlcpy(cap->driver, "s2255", sizeof(cap->driver)); 847 strlcpy(cap->driver, "s2255", sizeof(cap->driver));
848 strlcpy(cap->card, "s2255", sizeof(cap->card)); 848 strlcpy(cap->card, "s2255", sizeof(cap->card));
849 strlcpy(cap->bus_info, dev_name(&dev->udev->dev), 849 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
850 sizeof(cap->bus_info));
851 cap->version = S2255_VERSION; 850 cap->version = S2255_VERSION;
852 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 851 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
853 return 0; 852 return 0;