hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] v4l2-ctrls: make manual_mode_value 8 bits and check against control range 

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2011-06-28 10:43:13 -03:00 committed by Mauro Carvalho Chehab
parent 2330fb8242
commit 82a7c04944
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/video/v4l2-ctrls.c
View File

@ -1264,6 +1264,7 @@ void v4l2_ctrl_auto_cluster(unsigned ncontrols, struct v4l2_ctrl **controls,
v4l2_ctrl_cluster(ncontrols, controls); v4l2_ctrl_cluster(ncontrols, controls);
WARN_ON(ncontrols <= 1); WARN_ON(ncontrols <= 1);
WARN_ON(manual_val < master->minimum || manual_val > master->maximum);
master->is_auto = true; master->is_auto = true;
master->manual_mode_value = manual_val; master->manual_mode_value = manual_val;
master->flags |= V4L2_CTRL_FLAG_UPDATE; master->flags |= V4L2_CTRL_FLAG_UPDATE;

2
include/media/v4l2-ctrls.h
View File

@ -118,7 +118,7 @@ struct v4l2_ctrl {
unsigned int is_private:1; unsigned int is_private:1;
unsigned int is_volatile:1; unsigned int is_volatile:1;
unsigned int is_auto:1; unsigned int is_auto:1;
unsigned int manual_mode_value:5; unsigned int manual_mode_value:8;
const struct v4l2_ctrl_ops *ops; const struct v4l2_ctrl_ops *ops;
u32 id; u32 id;