lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 21 Aug 2015 11:29:43 +0200 From: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com> To: Mauro Carvalho Chehab <mchehab@....samsung.com>, Mike Isely <isely@...ox.com>, Laurent Pinchart <laurent.pinchart@...asonboard.com>, Hans Verkuil <hans.verkuil@...co.com>, Steven Toth <stoth@...nellabs.com>, Sakari Ailus <sakari.ailus@...ux.intel.com>, Vincent Palatin <vpalatin@...omium.org>, linux-media@...r.kernel.org, linux-kernel@...r.kernel.org Cc: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com> Subject: [PATCH 5/8] 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 Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com> --- drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c index 1c5f85bf7ed4..43b2f2214798 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c @@ -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,18 @@ 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( + if (ctls->which == V4L2_CTRL_WHICH_DEF_VAL) { + cptr = pvr2_hdw_get_ctrl_v4l(hdw, ctrl->id); + if (cptr) + pvr2_ctrl_get_def(cptr, &val); + else + ret = -EINVAL; + + + } else + ret = pvr2_ctrl_get_value( pvr2_hdw_get_ctrl_v4l(hdw, ctrl->id), &val); + if (ret) { ctls->error_idx = idx; return ret; @@ -658,6 +669,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; -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists