diff mbox series

[6.1.y-cip,16/30] media: rzg2l-cru: fix a test for timeout

Message ID	20240805164342.211857-17-biju.das.jz@bp.renesas.com (mailing list archive)
State	New
Headers	show Return-Path: <biju.das.jz@bp.renesas.com> ip: 210.160.252.172, mailfrom: biju.das.jz@bp.renesas.com) From: Biju Das <biju.das.jz@bp.renesas.com> To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>, Pavel Machek <pavel@denx.de> Cc: Biju Das <biju.das.jz@bp.renesas.com>, Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Subject: [PATCH 6.1.y-cip 16/30] media: rzg2l-cru: fix a test for timeout Date: Mon, 5 Aug 2024 17:43:09 +0100 Message-ID: <20240805164342.211857-17-biju.das.jz@bp.renesas.com> In-Reply-To: <20240805164342.211857-1-biju.das.jz@bp.renesas.com> References: <20240805164342.211857-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Add support for RZ/{G2L,G2LC,G2UL,V2L} Camera Data Receiving Unit \| expand [6.1.y-cip,00/30] Add support for RZ/{G2L,G2LC,G2UL,V2L} Camera Data Receiving Unit [6.1.y-cip,01/30] media: i2c: ov5645: Drop fetching the clk reference by name [6.1.y-cip,02/30] media: i2c: ov5645: Use runtime PM [6.1.y-cip,03/30] media: i2c: ov5645: Drop empty comment [6.1.y-cip,04/30] media: i2c: ov5645: Make sure to call PM functions [6.1.y-cip,05/30] media: i2c: ov5645: Call ov5645_entity_init_cfg() before registering the subdev [6.1.y-cip,06/30] media: i2c: ov5645: Remove software reset entry from ov5645_global_init_setting [6.1.y-cip,07/30] media: dt-bindings: Document Renesas RZ/G2L CSI-2 block [6.1.y-cip,08/30] media: dt-bindings: Document Renesas RZ/G2L CRU block [6.1.y-cip,09/30] clk: renesas: r9a07g044: Add clock and reset entries for CRU [6.1.y-cip,10/30] clk: renesas: r9a07g043: Add clock and reset entries for CRU [6.1.y-cip,11/30] media: platform: Add Renesas RZ/G2L MIPI CSI-2 receiver driver [6.1.y-cip,12/30] media: platform: Add Renesas RZ/G2L CRU driver [6.1.y-cip,13/30] media: rzg2l-cru: Remove unnecessary shadowing of ret in rzg2l_csi2_s_stream() [6.1.y-cip,14/30] media: platform: renesas: rzg2l-cru: Add missing documentation for image_conv_irq [6.1.y-cip,15/30] media: rzg2l-cru: Fix missing error code in rzg2l_cru_start_streaming_vq() [6.1.y-cip,16/30] media: rzg2l-cru: fix a test for timeout [6.1.y-cip,17/30] media: platform: rzg2l-cru: rzg2l-csi2: Switch to RUNTIME_PM_OPS() [6.1.y-cip,18/30] media: platform: rzg2l-cru: rzg2l-ip: Add delay after D-PHY reset [6.1.y-cip,19/30] media: platform: rzg2l-cru: rzg2l-video: Fix image processing initialization [6.1.y-cip,20/30] media: platform: rzg2l-cru: rzg2l-csi2: Restructure vclk handling [6.1.y-cip,21/30] media: platform: rzg2l-cru: rzg2l-video: Fix start reception procedure [6.1.y-cip,22/30] media: dt-bindings: renesas,rzg2l-csi2: Document Renesas RZ/G2UL CSI-2 block [6.1.y-cip,23/30] media: dt-bindings: renesas,rzg2l-cru: Document Renesas RZ/G2UL CRU block [6.1.y-cip,24/30] arm64: dts: renesas: r9a07g044: Add CSI and CRU nodes [6.1.y-cip,25/30] arm64: dts: renesas: r9a07g054: Add CSI and CRU nodes [6.1.y-cip,26/30] arm64: dts: renesas: r9a07g043u: Add CSI and CRU nodes [6.1.y-cip,27/30] arm64: dts: renesas: rzg2l-smarc: Enable CRU, CSI support [6.1.y-cip,28/30] arm64: dts: renesas: rzg2lc-smarc: Enable CRU, CSI support [6.1.y-cip,29/30] arm64: dts: renesas: rzg2ul-smarc: Enable CRU, CSI support [6.1.y-cip,30/30] arm64: defconfig: Enable RZ/G2L MIPI CSI-2 and CRU support

Commit Message

Biju Das Aug. 5, 2024, 4:43 p.m. UTC

From: Dan Carpenter <error27@gmail.com>

commit 94ae11885fae1717f2017cb96ceef5d0f6d6dd4a upstream.

The test for if the loop timed out is wrong and Smatch complains:

    drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c:411 rzg2l_csi2_mipi_link_disable()
    warn: should this be 'timeout == -1'

Let's change it to a preop loop instead of a post op loop.

Fixes: 51e8415e39a9 ("media: platform: Add Renesas RZ/G2L MIPI CSI-2 receiver driver")
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
index 3deb09be6400..33e08efa3039 100644
--- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
+++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-csi2.c
@@ -402,7 +402,7 @@  static void rzg2l_csi2_mipi_link_disable(struct rzg2l_csi2 *csi2)
 	rzg2l_csi2_write(csi2, CSI2nRTCT, CSI2nRTCT_VSRST);
 
 	/* Make sure CSI2nRTST.VSRSTS bit is cleared */
-	while (timeout--) {
+	while (--timeout) {
 		if (!(rzg2l_csi2_read(csi2, CSI2nRTST) & CSI2nRTST_VSRSTS))
 			break;
 		usleep_range(100, 200);