diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 22:44:16 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-27 22:44:16 -0200 |
| commit | 21877231e3db3aea6295d62290c7a5f9fe7e6d84 (patch) | |
| tree | 3f4de15e28ed053355d432c381f6f7dff368e016 /linux/drivers/media/video/s2255drv.c | |
| parent | 3b3a0da046f354c968c609f25969e0acbf01ce93 (diff) | |
| parent | 154d4bd2331d957d5fa42d52b405e62796570e32 (diff) | |
| download | mediapointer-dvb-s2-21877231e3db3aea6295d62290c7a5f9fe7e6d84.tar.gz mediapointer-dvb-s2-21877231e3db3aea6295d62290c7a5f9fe7e6d84.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/s2255drv.c')
| -rw-r--r-- | linux/drivers/media/video/s2255drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c index ffa2928b2..edfac2f9e 100644 --- a/linux/drivers/media/video/s2255drv.c +++ b/linux/drivers/media/video/s2255drv.c @@ -847,8 +847,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; |