From: Wenyuan Li <2063309626@qq.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
gszhai@bjtu.edu.cn, 25125332@bjtu.edu.cn, 25125283@bjtu.edu.cn,
23120469@bjtu.edu.cn, Wenyuan Li <2063309626@qq.com>
Subject: [PATCH] media: tuner: add error handling for I2C transfers in set_type()
Date: Tue, 24 Mar 2026 18:14:54 +0800 [thread overview]
Message-ID: <tencent_4F74E32262ADBA5C903DA759F45788147D0A@qq.com> (raw)
In set_type(), multiple I2C transfers are performed to initialize
certain tuners (FMD1216ME, FMD1216MEX, TD1316). However, the return
values of i2c_master_send() are not checked.
If any of these I2C transfers fail, the tuner initialization may be
incomplete, leading to incorrect device state or silent failures.
Fix this by:
- Adding a helper function tuner_i2c_send() that checks the return
value of i2c_master_send() and logs errors with %pe format
- Replacing direct i2c_master_send() calls with tuner_i2c_send()
- Propagating errors to the attach_failed path
This ensures that I2C communication failures during tuner
initialization are properly detected and handled.
Signed-off-by: Wenyuan Li <2063309626@qq.com>
---
drivers/media/v4l2-core/tuner-core.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 004ec4d7beea..01f28436a1f8 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -280,6 +280,19 @@ static const struct analog_demod_ops tuner_analog_ops = {
* Functions to select between radio and TV and tuner probe/remove functions
*/
+static int tuner_i2c_send(struct i2c_client *c, u8 *buf, int len)
+{
+ int ret = i2c_master_send(c, buf, len);
+
+ if (ret != len) {
+ int err = ret < 0 ? ret : -EIO;
+
+ dev_err(&c->dev, "I2C send failed: %pe\n", ERR_PTR(err));
+ return err;
+ }
+ return 0;
+}
+
/**
* set_type - Sets the tuner type for a given device
*
@@ -351,11 +364,13 @@ static void set_type(struct i2c_client *c, unsigned int type,
buffer[1] = 0xdc;
buffer[2] = 0x9c;
buffer[3] = 0x60;
- i2c_master_send(c, buffer, 4);
+ if (tuner_i2c_send(c, buffer, 4))
+ goto attach_failed;
mdelay(1);
buffer[2] = 0x86;
buffer[3] = 0x54;
- i2c_master_send(c, buffer, 4);
+ if (tuner_i2c_send(c, buffer, 4))
+ goto attach_failed;
if (!dvb_attach(simple_tuner_attach, &t->fe,
t->i2c->adapter, t->i2c->addr, t->type))
goto attach_failed;
@@ -365,7 +380,8 @@ static void set_type(struct i2c_client *c, unsigned int type,
buffer[1] = 0xdc;
buffer[2] = 0x86;
buffer[3] = 0xa4;
- i2c_master_send(c, buffer, 4);
+ if (tuner_i2c_send(c, buffer, 4))
+ goto attach_failed;
if (!dvb_attach(simple_tuner_attach, &t->fe,
t->i2c->adapter, t->i2c->addr, t->type))
goto attach_failed;
--
2.43.0
next reply other threads:[~2026-03-24 10:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-24 10:14 Wenyuan Li [this message]
2026-03-24 10:47 ` Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_4F74E32262ADBA5C903DA759F45788147D0A@qq.com \
--to=2063309626@qq.com \
--cc=23120469@bjtu.edu.cn \
--cc=25125283@bjtu.edu.cn \
--cc=25125332@bjtu.edu.cn \
--cc=gszhai@bjtu.edu.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®