]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (10309): s2255drv: use usb_make_path to report bus info
authorThierry MERLE <thierry.merle@free.fr>
Tue, 20 Jan 2009 21:19:25 +0000 (18:19 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Mar 2009 15:42:27 +0000 (12:42 -0300)
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>
drivers/media/video/s2255drv.c

index 31bc940752685cdd34701d9a75104fcd04f00c2d..b5be633e3bb0cb0683d7a085f553eb1a228c710c 100644 (file)
@@ -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;