aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2007-04-08 01:11:47 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-04-27 15:45:30 -0300
commit31a1854706707dc3b67eb0d3bf0f51c67d91c82e (patch)
tree724a4659f07d8b040578da07de3f07909336116d /drivers/media/video/pvrusb2/pvrusb2-v4l2.c
parent4f210e072235c3c123b068d348a1a02e624ff5be (diff)
downloadkernel_samsung_smdk4412-31a1854706707dc3b67eb0d3bf0f51c67d91c82e.zip
kernel_samsung_smdk4412-31a1854706707dc3b67eb0d3bf0f51c67d91c82e.tar.gz
kernel_samsung_smdk4412-31a1854706707dc3b67eb0d3bf0f51c67d91c82e.tar.bz2
V4L/DVB (5507): Pvrusb2: Gather USB bus address info and report it
The V4L2 API requires a unique bus_info string returned as part of the v4l2_capability structure. These changes gather up the USB address information, from the underlying device, into a string and report that out through v4l2 and via sysfs (for completeness). Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 25d3830..4563b3d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -203,6 +203,8 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
struct v4l2_capability *cap = arg;
memcpy(cap, &pvr_capability, sizeof(struct v4l2_capability));
+ strlcpy(cap->bus_info,pvr2_hdw_get_bus_info(hdw),
+ sizeof(cap->bus_info));
ret = 0;
break;