OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media: v4l2-ctrls.c: fix broken auto cluster handling 

When you switch from auto to manual mode for an auto-cluster (e.g.
autogain+gain controls), then the current HW value has to be copied
to the current control value. However, has_changed was never set to
true, so new_to_cur didn't actually copy this value.

Reported-by: Hugues FRUCHET <hugues.fruchet@st.com>
Tested-by: Hugues FRUCHET <hugues.fruchet@st.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Hans Verkuil 2018-06-29 06:12:43 -04:00 committed by Mauro Carvalho Chehab
parent 662a99e145
commit 0245abf820
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3137,9 +3137,22 @@ static int try_or_set_cluster(struct v4l2_fh *fh, struct v4l2_ctrl *master,
/* If OK, then make the new values permanent. */
update_flag = is_cur_manual(master) != is_new_manual(master);
for (i = 0; i < master->ncontrols; i++)
for (i = 0; i < master->ncontrols; i++) {
/*
* If we switch from auto to manual mode, and this cluster
* contains volatile controls, then all non-master controls
* have to be marked as changed. The 'new' value contains
* the volatile value (obtained by update_from_auto_cluster),
* which now has to become the current value.
*/
if (i && update_flag && is_new_manual(master) &&
master->has_volatiles && master->cluster[i])
master->cluster[i]->has_changed = true;
new_to_cur(fh, master->cluster[i], ch_flags |
((update_flag && i > 0) ? V4L2_EVENT_CTRL_CH_FLAGS : 0));
}
return 0;
}