| From 59e0b5312137ffbd356727b18033977879a5edc1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 5 Dec 2025 15:19:18 +0800 |
| Subject: media: i2c: ov5647: use our own mutex for the ctrl lock |
| |
| From: Xiaolei Wang <xiaolei.wang@windriver.com> |
| |
| [ Upstream commit 973e42fd5d2b397bff34f0c249014902dbf65912 ] |
| |
| __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: 4974c2f19fd8 ("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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/i2c/ov5647.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c |
| index ac5b26b3b452b..305677913a0c3 100644 |
| --- a/drivers/media/i2c/ov5647.c |
| +++ b/drivers/media/i2c/ov5647.c |
| @@ -1291,6 +1291,8 @@ static int ov5647_init_controls(struct ov5647 *sensor) |
| |
| v4l2_ctrl_handler_init(&sensor->ctrls, 9); |
| |
| + sensor->ctrls.lock = &sensor->lock; |
| + |
| v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops, |
| V4L2_CID_AUTOGAIN, 0, 1, 1, 0); |
| |
| -- |
| 2.51.0 |
| |
