diff options
author | Ricardo Ribalda <ribalda@chromium.org> | 2021-06-18 14:29:08 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-09-30 10:07:47 +0200 |
commit | 97a2777a96070afb7da5d587834086c0b586c8cc (patch) | |
tree | e5e6200b1ccc7fa8b46f853695b647e6c4e4d7ea /drivers/media/usb | |
parent | 0c6bcbdfefa83b8a1e9659b3c127758dce0fe7ac (diff) | |
download | linux-stable-97a2777a96070afb7da5d587834086c0b586c8cc.tar.gz linux-stable-97a2777a96070afb7da5d587834086c0b586c8cc.tar.bz2 linux-stable-97a2777a96070afb7da5d587834086c0b586c8cc.zip |
media: uvcvideo: Set capability in s_param
Fixes v4l2-compliance:
Format ioctls (Input 0):
warn: v4l2-test-formats.cpp(1339): S_PARM is supported but doesn't report V4L2_CAP_TIMEPERFRAME
fail: v4l2-test-formats.cpp(1241): node->has_frmintervals && !cap->capability
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r-- | drivers/media/usb/uvc/uvc_v4l2.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index ff97510b781b..60e3ac679ecb 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -472,10 +472,13 @@ static int uvc_v4l2_set_streamparm(struct uvc_streaming *stream, uvc_simplify_fraction(&timeperframe.numerator, &timeperframe.denominator, 8, 333); - if (parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) + if (parm->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) { parm->parm.capture.timeperframe = timeperframe; - else + parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; + } else { parm->parm.output.timeperframe = timeperframe; + parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME; + } return 0; } |