diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-02-17 03:44:08 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-03-02 15:06:19 -0500 |
commit | 06e5cc3d0d70a278baa7b9e1f466cd94b4a4285b (patch) | |
tree | 101798552d41c6da3ae29beb0bee30eacab1f2e0 /drivers/usb/gadget/function | |
parent | 9945eb9fad4edba2893d15cd720a702e6281ce19 (diff) |
[media] uvc gadget: set device_caps in querycap
The V4L2 core will warn if this is not done. Unfortunately this driver
wasn't updated.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/usb/gadget/function')
-rw-r--r-- | drivers/usb/gadget/function/uvc_v4l2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index 5a84e51675d1..cbd9bf020fb3 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c | |||
@@ -75,7 +75,8 @@ uvc_v4l2_querycap(struct file *file, void *fh, struct v4l2_capability *cap) | |||
75 | strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), | 75 | strlcpy(cap->bus_info, dev_name(&cdev->gadget->dev), |
76 | sizeof(cap->bus_info)); | 76 | sizeof(cap->bus_info)); |
77 | 77 | ||
78 | cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; | 78 | cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; |
79 | cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; | ||
79 | 80 | ||
80 | return 0; | 81 | return 0; |
81 | } | 82 | } |