Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91739838 authored by Ricardo Ribalda Delgado's avatar Ricardo Ribalda Delgado Committed by Mauro Carvalho Chehab
Browse files

[media] usb/uvc: Support for V4L2_CTRL_WHICH_DEF_VAL 



This driver does not use the control infrastructure.
Add support for the new field which on structure
 v4l2_ext_controls

Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 953eae5d

drivers/media/usb/uvc/uvc_v4l2.c

+20 −0
Original line number Diff line number Diff line
@@ -983,6 +983,22 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh, 
	unsigned int i;

	int ret;



	if (ctrls->which == V4L2_CTRL_WHICH_DEF_VAL) {

		for (i = 0; i < ctrls->count; ++ctrl, ++i) {

			struct v4l2_queryctrl qc = { .id = ctrl->id };



			ret = uvc_query_v4l2_ctrl(chain, &qc);

			if (ret < 0) {

				ctrls->error_idx = i;

				return ret;

			}



			ctrl->value = qc.default_value;

		}



		return 0;

	}



	ret = uvc_ctrl_begin(chain);

	if (ret < 0)

		return ret;
@@ -1010,6 +1026,10 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle, 
	unsigned int i;

	int ret;



	/* Default value cannot be changed */

	if (ctrls->which == V4L2_CTRL_WHICH_DEF_VAL)

		return -EINVAL;



	ret = uvc_ctrl_begin(chain);

	if (ret < 0)

		return ret;