openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Mike Isely <isely@pobox.com>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Ricardo Ribalda 2015-10-29 08:10:31 -02:00 committed by Mauro Carvalho Chehab
parent 91739838a5
commit 082afb7c4e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
View File

@ -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;