From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ECA5B3F3254; Sat, 28 Feb 2026 17:42:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300551; cv=none; b=iD/iJylXyc72cEAXEyJBjIT0tn276jXEWzOS0H4es0gJjvIwgGducSwevl7mDZkljcfiM8TFlCdTWTWcEnVl8mXeXMgcpxSzQ28siVxCDqXMyM4EwVi9T8V7y7IOqovjo/UzZWUOZJmIGfPX//fOctsrmlnS1OFNDDmVt00+rw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300551; c=relaxed/simple; bh=C61+88oPQ2DdJ12m9Oocrh9SBD0mftXNOwo8mXk41Wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vAWR8+yplkU3rKflvMhpLkC0PRfvmL1LGNAkXtqYYSOP21hnX3xfwFgeEZJHkgkImgIVL+wLR3bFwhVQLtoClmyV3HSO9slocwT07uKqRbIMMXI5mqExWNh+y9aJn65C6zxV32M4sbjoLHPVaYtiiJ6LsAPVcAD2HT5dzk6tBu4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ekk9+jcl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ekk9+jcl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DD95C19424; Sat, 28 Feb 2026 17:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300550; bh=C61+88oPQ2DdJ12m9Oocrh9SBD0mftXNOwo8mXk41Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ekk9+jclZhSC84aAzOnnoetbuQkhurQBK6X6vqCQc8j0qj6lWFN+e4XvppSSR9GxB M+mza6teMScpeZkyGcXxbaw65Qj4tfDrjB8lSHi/8G3IK3R8G/erFgrMIc2qIVnPHM oOrV7hJrA2Ad30xdRH822jrvivQqiKLixZUec+4pDIr5gRZgOHH6wY/DerqFdhM0Cg p2uUnSfmAIY53j7e6moe0iGPYOMTlauI+6Vfy2jUmUKPrFdoMOfao5wnl65H1Q3O1E Nx61QFWRjpk8oPkI8iL1wZXc2Rl0j0fquiw/5xsaFTPgqdCAtoo9PrL7cDAP4t32oq CWYkhkcRuVuuQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaolei Wang , Sakari Ailus , Hans Verkuil , Sasha Levin Subject: [PATCH 6.19 590/844] media: i2c: ov5647: use our own mutex for the ctrl lock Date: Sat, 28 Feb 2026 12:28:23 -0500 Message-ID: <20260228173244.1509663-591-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Xiaolei Wang [ 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 [Sakari Ailus: Fix a minor conflict.] Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- 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 bf5b0bd8d6acb..5fb10e02ba6e2 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