shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

CHROMIUM: v4l2-ctrls: fix s_ext_ctrls error when passing non-zero ctrl_class

Browse Source 
due to a merge mistake in I3b80a31681765836a134812ebc56686324ca5194.

Change-Id: Iad2914518997b664704f2c2933c8327fc4252bbb
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
This commit is contained in:
Jeffy Chen
2016-07-21 10:38:51 +08:00
committed by Gerrit Code Review
parent ab5ef60b32
commit 414afa62b9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/v4l2-core/v4l2-ctrls.c
View File

@@ -2801,6 +2801,7 @@ static int prepare_ext_ctrls(struct v4l2_ctrl_handler *hdl,
struct v4l2_ctrl_helper *helpers,
bool get)
{
u32 which = V4L2_CTRL_ID2WHICH(cs->which);
unsigned store = cs->config_store & 0xffff;
struct v4l2_ctrl_helper *h;
bool have_clusters = false;
@@ -2814,7 +2815,7 @@ static int prepare_ext_ctrls(struct v4l2_ctrl_handler *hdl,
cs->error_idx = i;
if (cs->which && V4L2_CTRL_ID2WHICH(id) != cs->which)
if (which && V4L2_CTRL_ID2WHICH(id) != cs->which)
return -EINVAL;
/* Old-style private controls are not allowed for