aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-02-07 05:06:21 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-05 13:36:12 -0500
commit39696009d0d4472606b7fb90fc635a0d0fecba60 (patch)
tree8d950506d6d59f9ab0310ba2778d2ccb4ebe7004
parent44d06d8273e032119c5ae0d0f90bb57ab8118a5b (diff)
[media] s2255: add device_caps support to querycap
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/usb/s2255/s2255drv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 55c972a0dbed..9cb832517040 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -821,10 +821,12 @@ static int vidioc_querycap(struct file *file, void *priv,
821{ 821{
822 struct s2255_fh *fh = file->private_data; 822 struct s2255_fh *fh = file->private_data;
823 struct s2255_dev *dev = fh->dev; 823 struct s2255_dev *dev = fh->dev;
824
824 strlcpy(cap->driver, "s2255", sizeof(cap->driver)); 825 strlcpy(cap->driver, "s2255", sizeof(cap->driver));
825 strlcpy(cap->card, "s2255", sizeof(cap->card)); 826 strlcpy(cap->card, "s2255", sizeof(cap->card));
826 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); 827 usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));
827 cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; 828 cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
829 cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
828 return 0; 830 return 0;
829} 831}
830 832