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

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

[media] media/usb/pvrusb2: 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

Acked-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 91739838

drivers/media/usb/pvrusb2/pvrusb2-v4l2.c

+14 −2
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ static int pvr2_g_ext_ctrls(struct file *file, void *priv, 
	struct pvr2_v4l2_fh *fh = file->private_data;

	struct pvr2_hdw *hdw = fh->channel.mc_head->hdw;

	struct v4l2_ext_control *ctrl;

	struct pvr2_ctrl *cptr;

	unsigned int idx;

	int val;

	int ret;
@@ -635,8 +636,15 @@ static int pvr2_g_ext_ctrls(struct file *file, void *priv, 
	ret = 0;

	for (idx = 0; idx < ctls->count; idx++) {

		ctrl = ctls->controls + idx;

		ret = pvr2_ctrl_get_value(

				pvr2_hdw_get_ctrl_v4l(hdw, ctrl->id), &val);

		cptr = pvr2_hdw_get_ctrl_v4l(hdw, ctrl->id);

		if (cptr) {

			if (ctls->which == V4L2_CTRL_WHICH_DEF_VAL)

				pvr2_ctrl_get_def(cptr, &val);

			else

				ret = pvr2_ctrl_get_value(cptr, &val);

		} else

			ret = -EINVAL;



		if (ret) {

			ctls->error_idx = idx;

			return ret;
@@ -658,6 +666,10 @@ static int pvr2_s_ext_ctrls(struct file *file, void *priv, 
	unsigned int idx;

	int ret;



	/* Default value cannot be changed */

	if (ctls->which == V4L2_CTRL_WHICH_DEF_VAL)

		return -EINVAL;



	ret = 0;

	for (idx = 0; idx < ctls->count; idx++) {

		ctrl = ctls->controls + idx;