diff options
| author |   Ricardo Ribalda <ribalda@chromium.org> | 2021-06-18 14:29:17 +0200 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-09-30 10:07:48 +0200 |
| commit | 6350d6a4ed487d16a3a021f76a7edcb9cb60fdbf (patch) | |
| tree | 1aaea36d7aeda79ff60fd2632c7431f850a07a14 /drivers/media/usb/uvc/uvc_v4l2.c | |
| parent | media: uvcvideo: Check controls flags before accessing them (diff) | |
| download | linux-dev-6350d6a4ed487d16a3a021f76a7edcb9cb60fdbf.tar.xz linux-dev-6350d6a4ed487d16a3a021f76a7edcb9cb60fdbf.zip | |
media: uvcvideo: Set error_idx during ctrl_commit errors
If we have an error setting a control, return the affected control in
the error_idx field.
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/uvc/uvc_v4l2.c')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index c10a638fff22..f4e4aff8ddf7 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1100,7 +1100,7 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle, ctrls->error_idx = 0; if (ioctl == VIDIOC_S_EXT_CTRLS) - return uvc_ctrl_commit(handle, ctrls->controls, ctrls->count); + return uvc_ctrl_commit(handle, ctrls); else return uvc_ctrl_rollback(handle); } |