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 51E1C3F54AE; Wed, 30 Sep 2026 06:42:50 +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=1790750570; cv=none; b=iJBSmw9mdHrMFP5931UpZVJdWejEf2x/AwGN1jMC0fnq7bRkFtiAD0PxjebBR4H2rovwdALr7/x8gXBWQkDwOr/zXmP2ORkJ0m4Vf+2mUAF5BJIDMkaJFYXrLEvyMALyCoM/Lf0TRzmENFDc6XbyK16Q0gVXLp8l6dQ4ArT3GjU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790750570; c=relaxed/simple; bh=CO2T0TShXLh0YQDK3d+IQ/aQD8IKWaiHzJsRA5shaao=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tuuk9lXojIk09/O4bUjDplNbmPpjcb9pTVpvdSUwjhfCvneK1XNOPLFU5lnZL2b1CM5lOM4dXW8pfGUVVpmsEB7Pe+ZlXXufvFhyDAJxToInSdv/wPENV2ZsTUOMU85i0H7jO5VagRnYkcKduOGoqGRBP6gzZ6ONFRtuN1OjQaY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iptxv1Dt; 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="iptxv1Dt" Received: by smtp.kernel.org (Postfix) with ESMTPS id ED43AC4AF18; Wed, 30 Sep 2026 06:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1790750570; bh=CO2T0TShXLh0YQDK3d+IQ/aQD8IKWaiHzJsRA5shaao=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=iptxv1Dtk1xlGJ7HHK3Or5BJVGIy3KoVQjzACqIS/nEfdilhzdYWSbEvN/9dUn8ts s8u/N+wGBBgP9PKyA9E+TJbvtyYoumkmUdM/9TRkxm6QgoNV5VmHXGQOJ9HuaPJjIN UXZEu7IXZw/A/ZLTYpLO/SXcoGu4nVEVY1BDeNZOH5GxTMxaWfTjuIIfDnMNAmRYyj jwFagBb3JgUriC9dR+uw7zOXqbNzatlMOtgQh+8XLe09CEZ26+dQUecyp6dTbHygjZ nasUy4xrQHTJaqv8YQKx0Cr3QXyXdL4/e1DJ6wme/34XcGS1W4am7KX7COl0KqioS4 Onh06uzORH8nA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7D7FCA5FAB; Wed, 30 Sep 2026 06:42:49 +0000 (UTC) From: Hermes Wu via B4 Relay Date: Wed, 30 Sep 2026 14:41:20 +0800 Subject: [PATCH v2 02/21] media: i2c: it6625: propagate initial-setup and control-update errors Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260930-upstream-it6625-follow-up-patch-v2-2-e353f887e7fa@ite.com.tw> References: <20260930-upstream-it6625-follow-up-patch-v2-0-e353f887e7fa@ite.com.tw> In-Reply-To: <20260930-upstream-it6625-follow-up-patch-v2-0-e353f887e7fa@ite.com.tw> To: Hermes Wu , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hans Verkuil Cc: Sakari Ailus , linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Hermes Wu X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1790750567; l=4296; i=Hermes.wu@ite.com.tw; s=20241230; h=from:subject:message-id; bh=90pok60+3e5gqhfAQTgKXaY0isPdDz9LBO2ZGVI6Tn4=; b=PqCigJcanrscKAcFYgk1zXuTgaYEzvulO7YUS/M7fcdeWN0lnHh+JH5WNttIidKcAHSN9KBOP tgt+yZ4970wBZsZyjgEQXkYNlMmoa02UuZiDzoghmZZgYi31l1cKYUA X-Developer-Key: i=Hermes.wu@ite.com.tw; a=ed25519; pk=qho5Dawp2WWj9CGyjtJ6/Y10xH8odjRdS6SXDaDAerU= X-Endpoint-Received: by B4 Relay for Hermes.wu@ite.com.tw/20241230 with auth_id=310 X-Original-From: Hermes Wu Reply-To: Hermes.wu@ite.com.tw From: Hermes Wu it6625_initial_setup() discarded every register write's return value internally, and probe() logged but did not propagate a failed it6625_v4l2_sd_ctrl_update() call; either way, probe() always registered the subdev regardless of failure. Make both functions return int, propagate the first error, and fail probe() with dev_err_probe() when either one fails. None of the three controls has a driver .ops, so the only failure path in v4l2_ctrl_s_ctrl() is range validation, and every value this driver passes is always in range -- this is an error-handling correctness fix responsive to review, not a fix for an observed runtime failure. Signed-off-by: Hermes Wu --- drivers/media/i2c/it6625.c | 64 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/drivers/media/i2c/it6625.c b/drivers/media/i2c/it6625.c index 25f9e61a7b03ff228ed61a99c41248036035881f..485e1667c7bea34b152ff3dde09a928f334d71aa 100644 --- a/drivers/media/i2c/it6625.c +++ b/drivers/media/i2c/it6625.c @@ -889,11 +889,19 @@ static int it6625_s_ctrl_audio_present(struct v4l2_subdev *sd) audio_present(it6625)); } -static void it6625_v4l2_sd_ctrl_update(struct v4l2_subdev *sd) +static int it6625_v4l2_sd_ctrl_update(struct v4l2_subdev *sd) { - it6625_s_ctrl_detect_hdmi_5v(sd); - it6625_s_ctrl_audio_sampling_rate(sd); - it6625_s_ctrl_audio_present(sd); + int ret; + + ret = it6625_s_ctrl_detect_hdmi_5v(sd); + if (ret) + return ret; + + ret = it6625_s_ctrl_audio_sampling_rate(sd); + if (ret) + return ret; + + return it6625_s_ctrl_audio_present(sd); } static void it6625_enable_stream_locked(struct it6625 *it6625, bool enable) @@ -940,9 +948,10 @@ static inline unsigned int fps_from_bt_timings(const struct v4l2_bt_timings *t) V4L2_DV_BT_FRAME_WIDTH(t)); } -static void it6625_initial_setup(struct it6625 *it6625) +static int it6625_initial_setup(struct it6625 *it6625) { int val = 0; + int err; guard(mutex)(&it6625->it6625_lock); @@ -968,13 +977,28 @@ static void it6625_initial_setup(struct it6625 *it6625) if (it6625->port_num == 2) val |= FIELD_PREP(B_MIPI_SPLIT, 1); - it6625_write_byte(it6625, REG_MIPI_CFG, val); - it6625_write_byte(it6625, REG_MIPI_DATA_TYPE, it6625->csi_format); - it6625_write_byte(it6625, REG_MIPI_CONTROL, 0x00); - it6625_write_byte(it6625, REG_RX_CFG, 0x00); + err = it6625_write_byte(it6625, REG_MIPI_CFG, val); + if (err) + return err; + + err = it6625_write_byte(it6625, REG_MIPI_DATA_TYPE, it6625->csi_format); + if (err) + return err; - it6625_set_bits(it6625, REG_HOST_CTRL_INT, B_CONFIG_UPDATE, B_CONFIG_UPDATE); - it6625_wait_for_status(it6625, REG_HOST_CTRL_INT, 0x00, 25); + err = it6625_write_byte(it6625, REG_MIPI_CONTROL, 0x00); + if (err) + return err; + + err = it6625_write_byte(it6625, REG_RX_CFG, 0x00); + if (err) + return err; + + err = it6625_set_bits(it6625, REG_HOST_CTRL_INT, B_CONFIG_UPDATE, + B_CONFIG_UPDATE); + if (err) + return err; + + return it6625_wait_for_status(it6625, REG_HOST_CTRL_INT, 0x00, 25); } static int it6625_cec_adap_enable(struct cec_adapter *adap, bool enable) @@ -1136,9 +1160,12 @@ static void it6625_clear_timings(struct it6625 *it6625) static void it6625_irq_hdmi_5v_change(struct it6625 *it6625) { struct v4l2_subdev *sd = &it6625->sd; + int ret; it6625_clear_timings(it6625); - it6625_v4l2_sd_ctrl_update(sd); + ret = it6625_v4l2_sd_ctrl_update(sd); + if (ret) + dev_err(it6625->dev, "%s: failed to update controls: %d", __func__, ret); } static void it6625_irq_hdcp_change(struct it6625 *it6625) @@ -2297,8 +2324,17 @@ static int it6625_probe(struct i2c_client *client) it6625_debugfs_init(it6625, client); - it6625_initial_setup(it6625); - it6625_v4l2_sd_ctrl_update(sd); + err = it6625_initial_setup(it6625); + if (err) { + dev_err_probe(it6625->dev, err, "failed initial hardware setup"); + goto err_clean_debugfs; + } + + err = it6625_v4l2_sd_ctrl_update(sd); + if (err) { + dev_err_probe(it6625->dev, err, "failed to update controls"); + goto err_clean_debugfs; + } err = v4l2_async_register_subdev(sd); if (err < 0) { -- 2.34.1