mirror of
https://github.com/torvalds/linux.git
synced 2026-08-02 13:22:02 +02:00
media: i2c: ov5647: use our own mutex for the ctrl lock
__v4l2_ctrl_handler_setup() and __v4l2_ctrl_modify_range() contains an
assertion to verify that the v4l2_ctrl_handler::lock is held, as it should
only be called when the lock has already been acquired. Therefore use our
own mutex for the ctrl lock, otherwise a warning will be reported.
Fixes: 4974c2f19f ("media: ov5647: Support gain, exposure and AWB controls")
Cc: stable@vger.kernel.org
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
[Sakari Ailus: Fix a minor conflict.]
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
ac9f4a5e49
commit
973e42fd5d
|
|
@ -1248,6 +1248,8 @@ static int ov5647_init_controls(struct ov5647 *sensor)
|
|||
|
||||
v4l2_ctrl_handler_init(&sensor->ctrls, 14);
|
||||
|
||||
sensor->ctrls.lock = &sensor->lock;
|
||||
|
||||
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
|
||||
V4L2_CID_AUTOGAIN, 0, 1, 1, 0);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user