From: Darshan Rathod <darshanrathod475@gmail.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Darshan Rathod <darshanrathod475@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] media: b2c2: flexcop-eeprom: Fix assignment and missing return in MAC check
Date: Fri, 18 Jul 2025 14:51:44 +0000 [thread overview]
Message-ID: <20250718145149.3180-1-darshanrathod475@gmail.com> (raw)
Fixes a coding style violation and build error in
`flexcop_eeprom_check_mac_addr()`. The function contained
an invalid assignment in an if-condition and was missing
a return at the end of a non-void function.
Fixes the warning:
warning: operation on ‘ret’ may be undefined [-Wsequence-point]
And the error:
error: control reaches end of non-void function [-Werror=return-type]
Signed-off-by: Darshan Rathod <darshanrathod475@gmail.com>
---
drivers/media/common/b2c2/flexcop-eeprom.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/media/common/b2c2/flexcop-eeprom.c b/drivers/media/common/b2c2/flexcop-eeprom.c
index 0f2151cd36f2..c4f66d13941e 100644
--- a/drivers/media/common/b2c2/flexcop-eeprom.c
+++ b/drivers/media/common/b2c2/flexcop-eeprom.c
@@ -90,7 +90,7 @@ static char eeprom_set_mac_addr(struct adapter *adapter, char type, u8 *mac)
static int flexcop_eeprom_read(struct flexcop_device *fc,
u16 addr, u8 *buf, u16 len)
{
- return fc->i2c_request(fc,FC_READ,FC_I2C_PORT_EEPROM,0x50,addr,buf,len);
+ return fc->i2c_request(fc, FC_READ, FC_I2C_PORT_EEPROM, 0x50, addr, buf, len);
}
#endif
@@ -107,7 +107,7 @@ static u8 calc_lrc(u8 *buf, int len)
static int flexcop_eeprom_request(struct flexcop_device *fc,
flexcop_access_op_t op, u16 addr, u8 *buf, u16 len, int retries)
{
- int i,ret = 0;
+ int i, ret = 0;
u8 chipaddr = 0x50 | ((addr >> 8) & 3);
for (i = 0; i < retries; i++) {
ret = fc->i2c_request(&fc->fc_i2c_adap[1], op, chipaddr,
@@ -135,12 +135,15 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended)
u8 buf[8];
int ret = 0;
- if ((ret = flexcop_eeprom_lrc_read(fc,0x3f8,buf,8,4)) == 0) {
+ ret = flexcop_eeprom_lrc_read(fc, 0x3f8, buf, 8, 4);
+
+ if (ret == 0) {
if (extended != 0) {
err("TODO: extended (EUI64) MAC addresses aren't completely supported yet");
- ret = -EINVAL;
- } else
- memcpy(fc->dvb_adapter.proposed_mac,buf,6);
+ ret = ret = -EINVAL;
+ } else {
+ memcpy(fc->dvb_adapter.proposed_mac, buf, 6);
+ }
}
return ret;
}
--
2.43.0
next reply other threads:[~2025-07-18 14:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-18 14:51 Darshan Rathod [this message]
2025-07-20 10:48 ` Markus Elfring
2025-07-21 5:20 ` Darshan Rathod
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=20250718145149.3180-1-darshanrathod475@gmail.com \
--to=darshanrathod475@gmail.com \
--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®